diff options
Diffstat (limited to 'Src/signals.c')
-rw-r--r-- | Src/signals.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Src/signals.c b/Src/signals.c index c8f5fbcca..a6eb8038b 100644 --- a/Src/signals.c +++ b/Src/signals.c @@ -1155,6 +1155,7 @@ dotrapargs(int sig, int *sigtr, void *sigfn) char *name, num[4]; int obreaks = breaks; int oretflag = retflag; + int olastval = lastval; int isfunc; int traperr, new_trap_state, new_trap_return; @@ -1261,6 +1262,13 @@ dotrapargs(int sig, int *sigtr, void *sigfn) } else { if (traperr && !EMULATION(EMULATE_SH)) lastval = 1; + else { + /* + * With no explicit forced return, we keep the + * lastval from before the trap ran. + */ + lastval = olastval; + } if (try_tryflag) errflag = traperr; breaks += obreaks; |