diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2019-03-03 21:57:50 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2019-03-28 21:18:03 +0800 |
| commit | 02a00569ba60e502f876c36d894ba0cc2d0682b3 (patch) | |
| tree | 3a47da47723a0872aee38196a4b1039c78bdd25f /src/eval.c | |
| parent | expand: Fix double-decrement in argstr (diff) | |
| download | dash-02a00569ba60e502f876c36d894ba0cc2d0682b3.tar.gz dash-02a00569ba60e502f876c36d894ba0cc2d0682b3.zip | |
eval: Reset handler when entering a subshell
As it is a subshell can execute code that is only meant for the parent shell when it executes a longjmp that is caught by something like evalcommand. This patch fixes it by resetting the handler when entering a subshell. Reported-by: Martijn Dekker <martijn@inlv.org> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to '')
| -rw-r--r-- | src/eval.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/eval.c b/src/eval.c index 1aad31a..6ee2e1a 100644 --- a/src/eval.c +++ b/src/eval.c @@ -41,6 +41,7 @@ * Evaluate a command. */ +#include "main.h" #include "shell.h" #include "nodes.h" #include "syntax.h" @@ -492,6 +493,7 @@ evalsubshell(union node *n, int flags) if (backgnd) flags &=~ EV_TESTED; nofork: + reset_handler(); redirect(n->nredir.redirect, 0); evaltreenr(n->nredir.n, flags); /* never returns */ @@ -574,6 +576,7 @@ evalpipe(union node *n, int flags) } } if (forkshell(jp, lp->n, n->npipe.backgnd) == 0) { + reset_handler(); INTON; if (pip[1] >= 0) { close(pip[0]); @@ -630,6 +633,7 @@ evalbackcmd(union node *n, struct backcmd *result) sh_error("Pipe call failed"); jp = makejob(n, 1); if (forkshell(jp, n, FORK_NOJOB) == 0) { + reset_handler(); FORCEINTON; close(pip[0]); if (pip[1] != 1) { |