diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2018-03-27 00:39:35 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2018-04-19 18:19:29 +0800 |
| commit | 46d5a7fcea81b489819f753451c1ad2fe435f148 (patch) | |
| tree | 815be18bb4833adef40246c99a4be0a9cd762fd4 | |
| parent | eval: Reap zombies after built-in commands and functions (diff) | |
| download | dash-46d5a7fcea81b489819f753451c1ad2fe435f148.tar.gz dash-46d5a7fcea81b489819f753451c1ad2fe435f148.zip | |
eval: Restore input files in evalcommand
When evalcommand invokes a command that modifies parsefile and then bails out without popping the file, we need to ensure the input file is restored so that the shell can continue to execute. 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 | 3 | ||||
| -rw-r--r-- | src/input.c | 10 | ||||
| -rw-r--r-- | src/input.h | 1 |
3 files changed, 12 insertions, 2 deletions
diff --git a/src/eval.c b/src/eval.c index 19e06ec..4b67fc9 100644 --- a/src/eval.c +++ b/src/eval.c @@ -694,6 +694,7 @@ evalcommand(union node *cmd, int flags) #endif { struct localvar_list *localvar_stop; + struct parsefile *file_stop; struct redirtab *redir_stop; struct stackmark smark; union node *argp; @@ -722,6 +723,7 @@ evalcommand(union node *cmd, int flags) TRACE(("evalcommand(0x%lx, %d) called\n", (long)cmd, flags)); setstackmark(&smark); localvar_stop = pushlocalvars(); + file_stop = parsefile; back_exitstatus = 0; cmdentry.cmdtype = CMDBUILTIN; @@ -896,6 +898,7 @@ out: if (cmd->ncmd.redirect) popredir(execcmd); unwindredir(redir_stop); + unwindfiles(file_stop); unwindlocalvars(localvar_stop); if (lastarg) /* dsl: I think this is intended to be used to support diff --git a/src/input.c b/src/input.c index e53423c..ae0c4c8 100644 --- a/src/input.c +++ b/src/input.c @@ -479,6 +479,13 @@ popfile(void) } +void unwindfiles(struct parsefile *stop) +{ + while (parsefile != stop) + popfile(); +} + + /* * Return to top level. */ @@ -486,8 +493,7 @@ popfile(void) void popallfiles(void) { - while (parsefile != &basepf) - popfile(); + unwindfiles(&basepf); } diff --git a/src/input.h b/src/input.h index ec97c1d..a9c0517 100644 --- a/src/input.h +++ b/src/input.h @@ -97,5 +97,6 @@ void popstring(void); int setinputfile(const char *, int); void setinputstring(char *); void popfile(void); +void unwindfiles(struct parsefile *); void popallfiles(void); void closescript(void); |