35046: unwind cmdstack when erroring out of lexing a parameter expansion in braces

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);