about summary refs log tree commit diff
path: root/Src
diff options
context:
space:
mode:
authorBart Schaefer <schaefer@zsh.org>2022-04-14 16:31:50 -0700
committerBart Schaefer <schaefer@zsh.org>2022-04-14 16:31:50 -0700
commitd24d7242fecec5a6d9db6f27f7439281dfa17021 (patch)
tree6880a1208316f0e73479282a462f7144fc16d5a6 /Src
parent0ad3b11a133d44343a6474ac40b5354d43d54c5d (diff)
downloadzsh-d24d7242fecec5a6d9db6f27f7439281dfa17021.tar.gz
zsh-d24d7242fecec5a6d9db6f27f7439281dfa17021.tar.xz
zsh-d24d7242fecec5a6d9db6f27f7439281dfa17021.zip
50068: 'exit' in trap causes calling function to return
Diffstat (limited to 'Src')
-rw-r--r--Src/builtin.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/Src/builtin.c b/Src/builtin.c
index 8ef678b22..b93466ba5 100644
--- a/Src/builtin.c
+++ b/Src/builtin.c
@@ -5720,6 +5720,8 @@ bin_break(char *name, char **argv, UNUSED(Options ops), int func)
 	     * a bad job.
 	     */
 	    if (stopmsg || (zexit(0, ZEXIT_DEFERRED), !stopmsg)) {
+		if (trap_state) 
+		    trap_state = TRAP_STATE_FORCE_RETURN;
 		retflag = 1;
 		breaks = loops;
 		exit_pending = 1;