diff options
| author | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2015-05-15 20:26:08 +0100 |
|---|---|---|
| committer | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2015-05-15 20:26:08 +0100 |
| commit | d52bf91659522435d68f719389095001f050b6c5 (patch) | |
| tree | d147912353f8432028562458afbf941ad8a4eb0f | |
| parent | 32a448dc25246ab3400f2459ba2648912c477137 (diff) | |
| download | zsh-d52bf91659522435d68f719389095001f050b6c5.tar.gz zsh-d52bf91659522435d68f719389095001f050b6c5.tar.xz zsh-d52bf91659522435d68f719389095001f050b6c5.zip | |
35155: cmdpop() could be called erroneously on error
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/lex.c | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 98b419eca..1d95e81fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-05-15 Peter Stephenson <p.w.stephenson@ntlworld.com> + + * 35155: Src/lex.c: cmdpop() could sometimes get called too + often on error. + 2015-05-15 Oliver Kiddle <opk@zsh.org> * users/20219: Completion/Unix/Command/_git: fix for git options diff --git a/Src/lex.c b/Src/lex.c index 5b6d3a69b..841fb0b86 100644 --- a/Src/lex.c +++ b/Src/lex.c @@ -1346,8 +1346,10 @@ gettokstr(int c, int sub) } brk: if (errflag) { - while(bct-- >= in_brace_param) - cmdpop(); + if (in_brace_param) { + while(bct-- >= in_brace_param) + cmdpop(); + } return LEXERR; } hungetc(c); |