summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko2016-07-21 14:40:08 +0200
committerDenys Vlasenko2016-07-21 14:42:13 +0200
commit49117b48008e0fe36d6680c787045cb44a300f93 (patch)
treec1df4e74c3cccaaf719122562a2dc937c2f665a2
parente695ac97fdd48808dd0a84d4725a063481a03c30 (diff)
downloadbusybox-49117b48008e0fe36d6680c787045cb44a300f93.zip
busybox-49117b48008e0fe36d6680c787045cb44a300f93.tar.gz
hush: fix a possible bug
Not sure this was actually a triggerable bug, but the code looked flaky. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--shell/hush.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/shell/hush.c b/shell/hush.c
index eabe83a..ab192e2 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -9153,9 +9153,11 @@ static int FAST_FUNC builtin_break(char **argv)
unsigned depth;
if (G.depth_of_loop == 0) {
bb_error_msg("%s: only meaningful in a loop", argv[0]);
+ /* if we came from builtin_continue(), need to undo "= 1" */
+ G.flag_break_continue = 0;
return EXIT_SUCCESS; /* bash compat */
}
- G.flag_break_continue++; /* BC_BREAK = 1 */
+ G.flag_break_continue++; /* BC_BREAK = 1, or BC_CONTINUE = 2 */
G.depth_break_continue = depth = parse_numeric_argv1(argv, 1, 1);
if (depth == UINT_MAX)