diff options
author | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2019-05-03 20:34:53 +0100 |
---|---|---|
committer | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2019-05-03 20:34:53 +0100 |
commit | 588bb77cb674a192eb176c01c8d17db1e9e4aba2 (patch) | |
tree | 95a4001a8c63fca4bbe3bf276e27603ae1b3648b /Src/loop.c | |
parent | 8ce9e20c4963b288cee9a76523c41579880aeeb1 (diff) | |
download | zsh-588bb77cb674a192eb176c01c8d17db1e9e4aba2.tar.gz zsh-588bb77cb674a192eb176c01c8d17db1e9e4aba2.tar.xz zsh-588bb77cb674a192eb176c01c8d17db1e9e4aba2.zip |
44271: Fix breaks propagated from until or return.
If the until or return test caused continuation but there was a pending return, breaks didn't get cancelled causing enclosing scope to skip commands.
Diffstat (limited to 'Src/loop.c')
-rw-r--r-- | Src/loop.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Src/loop.c b/Src/loop.c index 1013aeb50..3fa7006aa 100644 --- a/Src/loop.c +++ b/Src/loop.c @@ -425,7 +425,7 @@ execwhile(Estate state, UNUSED(int do_exec)) breaks--; simple_pline = old_simple_pline; - } else + } else { for (;;) { state->pc = loop; noerrexit = NOERREXIT_EXIT | NOERREXIT_RETURN; @@ -445,8 +445,11 @@ execwhile(Estate state, UNUSED(int do_exec)) lastval = oldval; break; } - if (retflag) + if (retflag) { + if (breaks) + breaks--; break; + } /* In case the loop body is also a functional no-op, * make sure signal handlers recognize ^C as above. */ @@ -470,6 +473,7 @@ execwhile(Estate state, UNUSED(int do_exec)) freeheap(); oldval = lastval; } + } cmdpop(); popheap(); loops--; |