From a06cd1766afdbb74ec97e650f0bd945a78a8fdc8 Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Fri, 14 Mar 2014 12:52:41 +0000 Subject: 32479: POSIXTRAPS and implicit return values. With POSIXTRAPS never propagate implicit return value. In any case if not forcing a return value don't use lastval from within the trap, use the one from the surrounding code. --- Src/signals.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'Src/signals.c') 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; -- cgit 1.4.1