From 2c208c7743e240d155b2650f74c374ecab08644f Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Wed, 27 Apr 2005 09:58:42 +0000 Subject: 21197: Fix LOCAL_TRAPS inside another trap --- Src/signals.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'Src/signals.c') diff --git a/Src/signals.c b/Src/signals.c index d1e6f22fe..e9571ef5b 100644 --- a/Src/signals.c +++ b/Src/signals.c @@ -888,6 +888,10 @@ removetrap(int sig) void starttrapscope(void) { + /* No special SIGEXIT behaviour inside another trap. */ + if (intrap) + return; + /* * SIGEXIT needs to be restored at the current locallevel, * so give it the next higher one. dosavetrap() is called @@ -917,8 +921,11 @@ endtrapscope(void) /* * Remember the exit trap, but don't run it until * after all the other traps have been put back. + * Don't do this inside another trap. */ - if ((exittr = sigtrapped[SIGEXIT])) { + if (intrap) + exittr = 0; + else if ((exittr = sigtrapped[SIGEXIT])) { if (exittr & ZSIG_FUNC) { exitfn = removehashnode(shfunctab, "TRAPEXIT"); } else { -- cgit 1.4.1