Bash-4.3 patch 26

diff --git a/parse.y b/parse.y
index cd3cf1e39f010935767e089101ca0ada83b1d516..4233e88e0e2c0c4d7828dd899e7d10db753697b5 100644 (file)
--- 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 e987c5701111f4121a02a18730b2f91bd894120d..535a291d8d22bb6440f5dadb1eb192c3123e6a78 100644 (file)
--- 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 8f7f96ebe641449dca36605a92642b9939c6a108..7a34ad7a73959968b1002e8d382432e082807004 100644 (file)
--- 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 */
-