From d52bf91659522435d68f719389095001f050b6c5 Mon Sep 17 00:00:00 2001
From: Peter Stephenson
Date: Fri, 15 May 2015 20:26:08 +0100
Subject: 35155: cmdpop() could be called erroneously on error
---
ChangeLog | 5 +++++
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
+
+ * 35155: Src/lex.c: cmdpop() could sometimes get called too
+ often on error.
+
2015-05-15 Oliver Kiddle
* 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);
--
cgit 1.4.1