From 7ae1cc16b4ecec930cd776f9ed688b6d4d53a166 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Sun, 20 Jul 2008 23:03:23 +0000 Subject: msh: fix "while...continue" bug 3884. --- shell/msh.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'shell/msh.c') diff --git a/shell/msh.c b/shell/msh.c index 44213c657..eb17eb668 100644 --- a/shell/msh.c +++ b/shell/msh.c @@ -2573,6 +2573,10 @@ static int execute(struct op *t, int *pin, int *pout, int no_fork) while (setjmp(bc.brkpt)) if (isbreak) goto broken; + /* Restore areanum value. It may be incremented by execute() + * below, and then "continue" may jump back to setjmp above */ + areanum = a + 1; + freearea(areanum + 1); brkset(&bc); for (t1 = t->left; i-- && *wp != NULL;) { setval(vp, *wp++); @@ -2586,6 +2590,10 @@ static int execute(struct op *t, int *pin, int *pout, int no_fork) while (setjmp(bc.brkpt)) if (isbreak) goto broken; + /* Restore areanum value. It may be incremented by execute() + * below, and then "continue" may jump back to setjmp above */ + areanum = a + 1; + freearea(areanum + 1); brkset(&bc); t1 = t->left; while ((execute(t1, pin, pout, /* no_fork: */ 0) == 0) == (t->op_type == TWHILE)) -- cgit v1.2.3