From: Chet Ramey <chet.ramey@case.edu>
Date: Fri, 26 Sep 2014 21:00:50 +0000 (-0400)
Subject: Bash-4.3 patch 26
X-Git-Tag: bash-4.4~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=836a17be08ee0696b89367ab1aa27d0be87169ed;p=thirdparty%2Fbash.git

Bash-4.3 patch 26
---

diff --git a/parse.y b/parse.y
index cd3cf1e39..4233e88e0 100644
--- a/parse.y
+++ b/parse.y
@@ -2953,6 +2953,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/patchlevel.h b/patchlevel.h
index e987c5701..535a291d8 100644
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -25,6 +25,6 @@
    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
    looks for to find the patch level (for the sccs version string). */
 
-#define PATCHLEVEL 25
+#define PATCHLEVEL 26
 
 #endif /* _PATCHLEVEL_H_ */
diff --git a/y.tab.c b/y.tab.c
index 8f7f96ebe..7a34ad7a7 100644
--- a/y.tab.c
+++ b/y.tab.c
@@ -5265,6 +5265,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';
@@ -8539,4 +8541,3 @@ set_line_mbstate ()
     }
 }
 #endif /* HANDLE_MULTIBYTE */
-