diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2014-04-20 10:27:15 -0700 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2014-04-20 10:27:15 -0700 |
| commit | 848badaa5f0a18ca3388016d49ffc340b6c2d0c6 (patch) | |
| tree | 6588e5f278aeb789405651e5d3c2f0c7409bf778 /Src/exec.c | |
| parent | 8189e12312ede991827efc6683b7ce8463deb0bf (diff) | |
| download | zsh-848badaa5f0a18ca3388016d49ffc340b6c2d0c6.tar.gz zsh-848badaa5f0a18ca3388016d49ffc340b6c2d0c6.zip | |
32568: consistency in handling of errflag condition during substitutions
Affects for/select word lists, function definition name position, and
anonymous function argument lists.
Diffstat (limited to 'Src/exec.c')
| -rw-r--r-- | Src/exec.c | 11 |
1 files changed, 9 insertions, 2 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(); |