7ae1cc16b
Denis Vlasenko
2008-07-20
Subject
msh: fix "while...continue" bug 3884.
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
shell/msh.c +8 -0shell/msh_test/msh-execution/many_continues.right +1 -0shell/msh_test/msh-execution/many_continues.tests +15 -0
shell/msh.c+8 -0
| @@ -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)) | |
shell/msh_test/msh-execution/many_continues.right+1 -0
| @@ -0,0 +1 @@ | |
| + | OK |
shell/msh_test/msh-execution/many_continues.tests+15 -0
| @@ -0,0 +1,15 @@ | |
| + | if test $# = 0; then |
| + | # Child will kill us in 1 second |
| + | "$THIS_SH" "$0" $$ & |
| + | |
| + | # Loop many, many times |
| + | trap 'echo OK; exit 0' 15 |
| + | while true; do |
| + | continue |
| + | done |
| + | echo BAD |
| + | exit 1 |
| + | fi |
| + | |
| + | sleep 1 |
| + | kill $1 |