diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2015-05-06 07:46:15 -0700 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2015-05-06 07:46:15 -0700 |
| commit | aa34d2f1652f31940534864c1a8ef5404c004638 (patch) | |
| tree | d5e5d7152f6518dd624b7af686f28650f880e9a8 | |
| parent | f29895cc08bc04d9788af4a12523bacbd6e6126a (diff) | |
| download | zsh-aa34d2f1652f31940534864c1a8ef5404c004638.tar.gz zsh-aa34d2f1652f31940534864c1a8ef5404c004638.tar.xz zsh-aa34d2f1652f31940534864c1a8ef5404c004638.zip | |
35046: unwind cmdstack when erroring out of lexing a parameter expansion in braces
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/lex.c | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 81e6f6270..4c1eec0b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-05-06 Barton E. Schaefer <schaefer@zsh.org> + + * 35046: Src/lex.c: properly unwind cmdstack when erroring out of + lexing a parameter expansion in braces + 2015-05-06 Peter Stephenson <p.stephenson@samsung.com> * c.f. 35041 (Axel Beckert): Doc/Zsh/zle.yo: typo. diff --git a/Src/lex.c b/Src/lex.c index c929bb9ba..5b6d3a69b 100644 --- a/Src/lex.c +++ b/Src/lex.c @@ -1345,8 +1345,11 @@ gettokstr(int c, int sub) break; } brk: - if (errflag) + if (errflag) { + while(bct-- >= in_brace_param) + cmdpop(); return LEXERR; + } hungetc(c); if (unmatched) zerr("unmatched %c", unmatched); |