Merge branch 'busybox' into merge

1 files changed, 4 insertions, 10 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 8ed0f19f3..8daf263dc 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -9631,8 +9631,11 @@ evaltree(union node *n, int flags)
 {
         int checkexit = 0;
         int (*evalfn)(union node *, int);
+        struct stackmark smark;
         int status = 0;
 
+        setstackmark(&smark);
+
         if (n == NULL) {
                 TRACE(("evaltree(NULL) called\n"));
                 goto out;
@@ -9746,6 +9749,7 @@ evaltree(union node *n, int flags)
         if (flags & EV_EXIT)
                 raise_exception(EXEXIT);
 
+        popstackmark(&smark);
         TRACE(("leaving evaltree (no interrupts)\n"));
         return exitstatus;
 }
@@ -9806,14 +9810,12 @@ evalfor(union node *n, int flags)
         struct arglist arglist;
         union node *argp;
         struct strlist *sp;
-        struct stackmark smark;
         int status = 0;
 
         errlinno = lineno = n->ncase.linno;
         if (funcline)
                 lineno -= funcline - 1;
 
-        setstackmark(&smark);
         arglist.list = NULL;
         arglist.lastp = &arglist.list;
         for (argp = n->nfor.args; argp; argp = argp->narg.next) {
@@ -9830,7 +9832,6 @@ evalfor(union node *n, int flags)
                         break;
         }
         loopnest--;
-        popstackmark(&smark);
 
         return status;
 }
@@ -9841,14 +9842,12 @@ evalcase(union node *n, int flags)
         union node *cp;
         union node *patp;
         struct arglist arglist;
-        struct stackmark smark;
         int status = 0;
 
         errlinno = lineno = n->ncase.linno;
         if (funcline)
                 lineno -= funcline - 1;
 
-        setstackmark(&smark);
         arglist.list = NULL;
         arglist.lastp = &arglist.list;
         expandarg(n->ncase.expr, &arglist, EXP_TILDE);
@@ -9867,8 +9866,6 @@ evalcase(union node *n, int flags)
                 }
         }
  out:
-        popstackmark(&smark);
-
         return status;
 }
 
@@ -10590,7 +10587,6 @@ evalcommand(union node *cmd, int flags)
         struct localvar_list *localvar_stop;
         struct parsefile *file_stop;
         struct redirtab *redir_stop;
-        struct stackmark smark;
         union node *argp;
         struct arglist arglist;
         struct arglist varlist;
@@ -10615,7 +10611,6 @@ evalcommand(union node *cmd, int flags)
 
         /* First expand the arguments. */
         TRACE(("evalcommand(0x%lx, %d) called\n", (long)cmd, flags));
-        setstackmark(&smark);
         localvar_stop = pushlocalvars();
         file_stop = g_parsefile;
         back_exitstatus = 0;
@@ -10936,7 +10931,6 @@ evalcommand(union node *cmd, int flags)
                  */
                 setvar0("_", lastarg);
         }
-        popstackmark(&smark);
 
         return status;
 }