diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2016-11-05 13:54:16 -0700 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2016-11-05 13:54:16 -0700 |
| commit | 2c56c7e5e809476fc6511a9e634d2a977593ef9e (patch) | |
| tree | 00dc80fc97d4b085ef38f00ff7902352564acec5 | |
| parent | d91ffb1db2784c3ff17d93db8d1fe38816fc5129 (diff) | |
| download | zsh-2c56c7e5e809476fc6511a9e634d2a977593ef9e.tar.gz zsh-2c56c7e5e809476fc6511a9e634d2a977593ef9e.tar.xz zsh-2c56c7e5e809476fc6511a9e634d2a977593ef9e.zip | |
39839: fix "return" from "if" condition
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | Src/loop.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index bcea79190..fef3a92c9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2016-11-05 Barton E. Schaefer <schaefer@zsh.org> + * 39839: Src/loop.c: fix "return" from "if" condition + * 39838: Src/builtin.c: another missing unqueue_signals() 2016-11-04 Oliver Kiddle <opk@zsh.org> diff --git a/Src/loop.c b/Src/loop.c index b791a898d..f65c72bf4 100644 --- a/Src/loop.c +++ b/Src/loop.c @@ -570,7 +570,8 @@ execif(Estate state, int do_exec) cmdpop(); } else { noerrexit = olderrexit; - lastval = 0; + if (!retflag) + lastval = 0; } state->pc = end; |