From f42e443bb511ed3224f09b4fcf0772438ebdbbfa Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Wed, 8 Sep 2010 20:07:26 +0800 Subject: [EXPAND] Fix ifsfirst/ifslastp leak As it stands expandarg may return with a non-NULL ifslastp which then confuses any subsequent ifsbreakup user that doesn't clear it directly. What's worse, if we get interrupted before we hit ifsfree in expandarg we will leak memory. This patch fixes this by always calling ifsfree in expandarg thus ensuring that ifslastp is always NULL on the normal path. It also adds an ifsfree call to the RESET path to ensure that memory isn't leaked. Signed-off-by: Herbert Xu --- ChangeLog | 4 ++++ src/expand.c | 30 +++++++++++++++++++----------- src/expand.h | 1 + src/miscbltin.c | 2 +- 4 files changed, 25 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3c26149..a51975c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-09-08 Herbert Xu + + * Fix ifsfirst/ifslastp leak. + 2010-09-08 maximilian attems * Debug compile fix. diff --git a/src/expand.c b/src/expand.c index f2f964c..d6c6416 100644 --- a/src/expand.c +++ b/src/expand.c @@ -117,7 +117,6 @@ STATIC char *evalvar(char *, int); STATIC size_t strtodest(const char *, const char *, int); STATIC void memtodest(const char *, size_t, const char *, int); STATIC ssize_t varvalue(char *, int, int); -STATIC void ifsfree(void); STATIC void expandmeta(struct strlist *, int); #ifdef HAVE_GLOB STATIC void addglob(const glob_t *); @@ -191,8 +190,6 @@ expandarg(union node *arg, struct arglist *arglist, int flag) argbackq = arg->narg.backquote; STARTSTACKSTR(expdest); - ifsfirst.next = NULL; - ifslastp = NULL; argstr(arg->narg.text, flag); p = _STPUTC('\0', expdest); expdest = p - 1; @@ -215,8 +212,7 @@ expandarg(union node *arg, struct arglist *arglist, int flag) *exparg.lastp = sp; exparg.lastp = &sp->next; } - if (ifsfirst.next) - ifsfree(); + ifsfree(); *exparg.lastp = NULL; if (exparg.list) { *arglist->lastp = exparg.list; @@ -1108,22 +1104,25 @@ add: arglist->lastp = &sp->next; } -STATIC void -ifsfree(void) +void ifsfree(void) { - struct ifsregion *p; + struct ifsregion *p = ifsfirst.next; + + if (!p) + goto out; INTOFF; - p = ifsfirst.next; do { struct ifsregion *ifsp; ifsp = p->next; ckfree(p); p = ifsp; } while (p); - ifslastp = NULL; ifsfirst.next = NULL; INTON; + +out: + ifslastp = NULL; } @@ -1678,7 +1677,6 @@ casematch(union node *pattern, char *val) setstackmark(&smark); argbackq = pattern->narg.backquote; STARTSTACKSTR(expdest); - ifslastp = NULL; argstr(pattern->narg.text, EXP_TILDE | EXP_CASE); STACKSTRNUL(expdest); result = patmatch(stackblock(), val); @@ -1718,3 +1716,13 @@ varunset(const char *end, const char *var, const char *umsg, int varflags) } sh_error("%.*s: %s%s", end - var - 1, var, msg, tail); } + +#ifdef mkinit + +INCLUDE "expand.h" + +RESET { + ifsfree(); +} + +#endif diff --git a/src/expand.h b/src/expand.h index 405af0b..4251a4a 100644 --- a/src/expand.h +++ b/src/expand.h @@ -70,6 +70,7 @@ int casematch(union node *, char *); void recordregion(int, int, int); void removerecordregions(int); void ifsbreakup(char *, struct arglist *); +void ifsfree(void); /* From arith.y */ intmax_t arith(const char *); diff --git a/src/miscbltin.c b/src/miscbltin.c index 5ab1648..c42a01c 100644 --- a/src/miscbltin.c +++ b/src/miscbltin.c @@ -89,7 +89,7 @@ readcmd_handle_line(char *line, char **ap, size_t len) ifsbreakup(s, &arglist); *arglist.lastp = NULL; - removerecordregions(0); + ifsfree(); for (sl = arglist.list; sl; sl = sl->next) { /* remaining fields present, but no variables left. */ -- cgit 1.4.1 irl/commit/ui.c?h=2.0&id=2faa73abd63d3373ba12e59427d948720188bfbf&follow=1'>Remove topic TODOJune McEnroe 2019-02-22Add /znc commandJune McEnroe 2019-02-22Update status line after scrolling and term eventsJune McEnroe 2019-02-22Reorganize input.cJune McEnroe 2019-02-22Fix name of <raw> window in man pageJune McEnroe 2019-02-22Rename global tags with angle bracketsJune McEnroe 2019-02-22Show status window while connectingJune McEnroe 2019-02-22Reorganize UI code for the umpteenth timeJune McEnroe 2019-02-21Replace "view" with "window"June McEnroe 2019-02-21Remove ROT13June McEnroe 2019-02-21Clean up man pageJune McEnroe 2019-01-26Draw UI before connectingJune McEnroe 2019-01-25Avoid unused variable warnings with getyxJune McEnroe 2019-01-25Add GNU/Linux build instructionsJune McEnroe