From 0d1fb088a4a16569260de4266d4bd359491c6bcd Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Fri, 3 Oct 2014 14:07:07 +0800 Subject: [EVAL] Do not clobber exitstatus in evalcommand All originators of EXERROR have been setting the exitstatus for a while now. So it is no longer appropriate to set it explicitly in evalcommand. In fact doing so may cause the original exitstatus to be lost. Signed-off-by: Herbert Xu --- ChangeLog | 4 ++++ src/eval.c | 9 +++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9a601df..4dc8fa3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-10-03 Herbert Xu + + * Do not clobber exitstatus in evalcommand. + 2014-10-02 Herbert Xu * Fix use-after-free in dotrap/evalstring. diff --git a/src/eval.c b/src/eval.c index 0708bf5..3f4d957 100644 --- a/src/eval.c +++ b/src/eval.c @@ -853,12 +853,9 @@ bail: listsetvar(varlist.list, VEXPORT); } if (evalbltin(cmdentry.u.cmd, argc, argv, flags)) { - if (exception == EXERROR) { - exitstatus = 2; - if (spclbltin <= 0) { - FORCEINTON; - break; - } + if (exception == EXERROR && spclbltin <= 0) { + FORCEINTON; + break; } raise: longjmp(handler->loc, 1); -- cgit 1.4.1