diff options
| author | Denys Vlasenko | 2013-04-07 18:16:58 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2013-04-07 18:16:58 +0200 |
| commit | 3beab83e4f7f4213c185737e95dc4895f0059dd6 (patch) | |
| tree | 89293330f61c17e734d5367954409a37261e95ca | |
| parent | d35cbad0efaa57bf7c5280e62825966f7757906a (diff) | |
| download | busybox-3beab83e4f7f4213c185737e95dc4895f0059dd6.zip busybox-3beab83e4f7f4213c185737e95dc4895f0059dd6.tar.gz | |
hush: fix for "while false && true; do echo BUG; break; done". closes 6170
function old new delta
run_list 959 941 -18
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | shell/hush.c | 19 | ||||
| -rw-r--r-- | shell/hush_test/hush-misc/while4.right | 1 | ||||
| -rwxr-xr-x | shell/hush_test/hush-misc/while4.tests | 6 |
3 files changed, 16 insertions, 10 deletions
diff --git a/shell/hush.c b/shell/hush.c index b233257..1d421dc 100644 --- a/shell/hush.c +++ b/shell/hush.c @@ -7354,7 +7354,7 @@ static int run_list(struct pipe *pi) * and we should not execute CMD */ debug_printf_exec("skipped cmd because of || or &&\n"); last_followup = pi->followup; - continue; + goto dont_check_jobs_but_continue; } } last_followup = pi->followup; @@ -7493,8 +7493,10 @@ static int run_list(struct pipe *pi) G.flag_break_continue = 0; /* else: e.g. "continue 2" should *break* once, *then* continue */ } /* else: "while... do... { we are here (innermost list is not a loop!) };...done" */ - if (G.depth_break_continue != 0 || fbc == BC_BREAK) - goto check_jobs_and_break; + if (G.depth_break_continue != 0 || fbc == BC_BREAK) { + checkjobs(NULL); + break; + } /* "continue": simulate end of loop */ rword = RES_DONE; continue; @@ -7502,7 +7504,6 @@ static int run_list(struct pipe *pi) #endif #if ENABLE_HUSH_FUNCTIONS if (G.flag_return_in_progress == 1) { - /* same as "goto check_jobs_and_break" */ checkjobs(NULL); break; } @@ -7544,6 +7545,9 @@ static int run_list(struct pipe *pi) if (rword == RES_IF || rword == RES_ELIF) cond_code = rcode; #endif + check_jobs_and_continue: + checkjobs(NULL); + dont_check_jobs_but_continue: ; #if ENABLE_HUSH_LOOPS /* Beware of "while false; true; do ..."! */ if (pi->next @@ -7555,22 +7559,17 @@ static int run_list(struct pipe *pi) /* "while false; do...done" - exitcode 0 */ G.last_exitcode = rcode = EXIT_SUCCESS; debug_printf_exec(": while expr is false: breaking (exitcode:EXIT_SUCCESS)\n"); - goto check_jobs_and_break; + break; } } if (rword == RES_UNTIL) { if (!rcode) { debug_printf_exec(": until expr is true: breaking\n"); - check_jobs_and_break: - checkjobs(NULL); break; } } } #endif - - check_jobs_and_continue: - checkjobs(NULL); } /* for (pi) */ #if ENABLE_HUSH_JOB diff --git a/shell/hush_test/hush-misc/while4.right b/shell/hush_test/hush-misc/while4.right new file mode 100644 index 0000000..7b24a35 --- /dev/null +++ b/shell/hush_test/hush-misc/while4.right @@ -0,0 +1 @@ +Ok:0 diff --git a/shell/hush_test/hush-misc/while4.tests b/shell/hush_test/hush-misc/while4.tests new file mode 100755 index 0000000..ba80e60 --- /dev/null +++ b/shell/hush_test/hush-misc/while4.tests @@ -0,0 +1,6 @@ +false +while false && echo Not reached; do + echo BUG + break +done +echo Ok:$? |