diff options
Diffstat (limited to 'Src')
| -rw-r--r-- | Src/exec.c | 11 | ||||
| -rw-r--r-- | Src/loop.c | 14 |
2 files changed, 21 insertions, 4 deletions
diff --git a/Src/exec.c b/Src/exec.c index d821d164f..8249deff2 100644 --- a/Src/exec.c +++ b/Src/exec.c @@ -4243,8 +4243,10 @@ execfuncdef(Estate state, UNUSED(int do_exec)) if (htok && names) { execsubst(names); - if (errflag) + if (errflag) { + state->pc = end; return 1; + } } while (!names || (s = (char *) ugetnode(names))) { @@ -4301,8 +4303,13 @@ execfuncdef(Estate state, UNUSED(int do_exec)) end += *state->pc++; args = ecgetlist(state, *state->pc++, EC_DUPTOK, &htok); - if (htok && args) + if (htok && args) { execsubst(args); + if (errflag) { + state->pc = end; + return 1; + } + } if (!args) args = newlinklist(); diff --git a/Src/loop.c b/Src/loop.c index 90a0761b3..dc8f2320f 100644 --- a/Src/loop.c +++ b/Src/loop.c @@ -87,8 +87,13 @@ execfor(Estate state, int do_exec) state->pc = end; return 0; } - if (htok) + if (htok) { execsubst(args); + if (errflag) { + state->pc = end; + return 1; + } + } } else { char **x; @@ -223,8 +228,13 @@ execselect(Estate state, UNUSED(int do_exec)) state->pc = end; return 0; } - if (htok) + if (htok) { execsubst(args); + if (errflag) { + state->pc = end; + return 1; + } + } } if (!args || empty(args)) { state->pc = end; |