mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-28 05:00:59 +01:00
Code Releases Activity

21197: Fix LOCAL_TRAPS inside another trap

Browse source
This commit is contained in:
Peter Stephenson 2005-04-27 09:58:42 +00:00
parent f49c66fc6a
commit 2c208c7743
3 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Src/signals.c
View file

@ -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 {