emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ash: eval: avoid leaking memory associated with redirections. Closes 7748

Browse Source 
The following constructs result in ever-increasing memory usage:

   while true; do { true; } </dev/null; done
   while true; do ( true; ) </dev/null; done

For comparison, bash displays static memory usage in both cases.

This has been fixed in dash by commit 2bc6caa.  The maintainer
writes:

   I have simplified evaltree so that it simply sets the stack mark
   unconditionally.  This allows us to remove the stack marks in the
   functions called by evaltree.

Closes BusyBox bug 7748.

function                                             old     new   delta
evaltree                                             606     632     +26
evalcommand                                         1724    1696     -28
evalcase                                             382     351     -31
evalfor                                              230     196     -34
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/3 up/down: 26/-93)            Total: -67 bytes

Signed-off-by: Ron Yorston <rmy@pobox.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Ron Yorston 2019-02-25 08:29:38 +00:00 committed by Denys Vlasenko
parent e563f9e851
commit f55161ad27
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
shell/ash.c
View File

@ -9034,8 +9034,11 @@ evaltree(union node *n, int flags)
{ {
int checkexit = 0; int checkexit = 0;
int (*evalfn)(union node *, int); int (*evalfn)(union node *, int);
struct stackmark smark;
int status = 0; int status = 0;
setstackmark(&smark);
if (n == NULL) { if (n == NULL) {
TRACE(("evaltree(NULL) called\n")); TRACE(("evaltree(NULL) called\n"));
goto out; goto out;
@ -9149,6 +9152,7 @@ evaltree(union node *n, int flags)
if (flags & EV_EXIT) if (flags & EV_EXIT)
raise_exception(EXEXIT); raise_exception(EXEXIT);
popstackmark(&smark);
TRACE(("leaving evaltree (no interrupts)\n")); TRACE(("leaving evaltree (no interrupts)\n"));
return exitstatus; return exitstatus;
} }
@ -9209,14 +9213,12 @@ evalfor(union node *n, int flags)
struct arglist arglist; struct arglist arglist;
union node *argp; union node *argp;
struct strlist *sp; struct strlist *sp;
struct stackmark smark;
int status = 0; int status = 0;
errlinno = lineno = n->ncase.linno; errlinno = lineno = n->ncase.linno;
if (funcline) if (funcline)
lineno -= funcline - 1; lineno -= funcline - 1;
setstackmark(&smark);
arglist.list = NULL; arglist.list = NULL;
arglist.lastp = &arglist.list; arglist.lastp = &arglist.list;
for (argp = n->nfor.args; argp; argp = argp->narg.next) { for (argp = n->nfor.args; argp; argp = argp->narg.next) {
@ -9233,7 +9235,6 @@ evalfor(union node *n, int flags)
break; break;
} }
loopnest--; loopnest--;
popstackmark(&smark);
return status; return status;
} }
@ -9244,14 +9245,12 @@ evalcase(union node *n, int flags)
union node *cp; union node *cp;
union node *patp; union node *patp;
struct arglist arglist; struct arglist arglist;
struct stackmark smark;
int status = 0; int status = 0;
errlinno = lineno = n->ncase.linno; errlinno = lineno = n->ncase.linno;
if (funcline) if (funcline)
lineno -= funcline - 1; lineno -= funcline - 1;
setstackmark(&smark);
arglist.list = NULL; arglist.list = NULL;
arglist.lastp = &arglist.list; arglist.lastp = &arglist.list;
expandarg(n->ncase.expr, &arglist, EXP_TILDE); expandarg(n->ncase.expr, &arglist, EXP_TILDE);
@ -9270,8 +9269,6 @@ evalcase(union node *n, int flags)
} }
} }
out: out:
popstackmark(&smark);
return status; return status;
} }
@ -9970,7 +9967,6 @@ evalcommand(union node *cmd, int flags)
struct localvar_list *localvar_stop; struct localvar_list *localvar_stop;
struct parsefile *file_stop; struct parsefile *file_stop;
struct redirtab *redir_stop; struct redirtab *redir_stop;
struct stackmark smark;
union node *argp; union node *argp;
struct arglist arglist; struct arglist arglist;
struct arglist varlist; struct arglist varlist;
@ -9992,7 +9988,6 @@ evalcommand(union node *cmd, int flags)
/* First expand the arguments. */ /* First expand the arguments. */
TRACE(("evalcommand(0x%lx, %d) called\n", (long)cmd, flags)); TRACE(("evalcommand(0x%lx, %d) called\n", (long)cmd, flags));
setstackmark(&smark);
localvar_stop = pushlocalvars(); localvar_stop = pushlocalvars();
file_stop = g_parsefile; file_stop = g_parsefile;
back_exitstatus = 0; back_exitstatus = 0;
@ -10275,7 +10270,6 @@ evalcommand(union node *cmd, int flags)
*/ */
setvar0("_", lastarg); setvar0("_", lastarg);
} }
popstackmark(&smark);
return status; return status;
} }