Patch CVE-2014-7169stable-2014092500cm-11.0-XNPH44S-bacon-5fa8c79c0b

Patch-ID: bash41-013
Under certain circumstances, bash can incorrectly save a lookahead character and
return it on a subsequent call, even when reading a new line.

Change-Id: I29dcf444011f77e104b6a82e8cada731e3917646
ref: http://seclists.org/oss-sec/2014/q3/734
ref: http://seclists.org/oss-sec/2014/q3/685

2 files changed, 4 insertions, 0 deletions

diff --git a/parse.y b/parse.y
index e265a89..38fb260 100644
--- a/parse.y
+++ b/parse.y
@@ -2848,6 +2848,8 @@ reset_parser ()
   FREE (word_desc_to_read);
   word_desc_to_read = (WORD_DESC *)NULL;
 
+  eol_ungetc_lookahead = 0;
+
   current_token = '\n';		/* XXX */
   last_read_token = '\n';
   token_to_read = '\n';
diff --git a/y.tab.c b/y.tab.c
index 85c96d7..ff11a5d 100644
--- a/y.tab.c
+++ b/y.tab.c
@@ -5160,6 +5160,8 @@ reset_parser ()
   FREE (word_desc_to_read);
   word_desc_to_read = (WORD_DESC *)NULL;
 
+  eol_ungetc_lookahead = 0;
+
   current_token = '\n';		/* XXX */
   last_read_token = '\n';
   token_to_read = '\n';