diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2005-04-27 10:03:14 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2005-04-27 10:03:14 +0000 |
| commit | 24aed1f2b1790f4ed6defac392230a6aa1f37dfd (patch) | |
| tree | b708f5292afc5cf561d88b0bdc4972ac9d345d9c /Src/exec.c | |
| parent | 0b136fcaf4fccab44a43ba171623d3b2ed402ac3 (diff) | |
| download | zsh-24aed1f2b1790f4ed6defac392230a6aa1f37dfd.tar.gz zsh-24aed1f2b1790f4ed6defac392230a6aa1f37dfd.tar.xz zsh-24aed1f2b1790f4ed6defac392230a6aa1f37dfd.zip | |
21197: Fix LOCAL_TRAPS inside another trap
Diffstat (limited to 'Src/exec.c')
| -rw-r--r-- | Src/exec.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Src/exec.c b/Src/exec.c index 24355d275..2db264435 100644 --- a/Src/exec.c +++ b/Src/exec.c @@ -3544,8 +3544,7 @@ doshfunc(char *name, Eprog prog, LinkList doshargs, int flags, int noreturnval) memcpy(oldpipestats, pipestats, bytes); } - if (!intrap) - starttrapscope(); + starttrapscope(); tab = pparams; if (!(flags & PM_UNDEFINED)) @@ -3645,8 +3644,7 @@ doshfunc(char *name, Eprog prog, LinkList doshargs, int flags, int noreturnval) opts[LOCALOPTIONS] = saveopts[LOCALOPTIONS]; } - if (!intrap) - endtrapscope(); + endtrapscope(); if (trapreturn < -1) trapreturn++; |