From: Chet Ramey <chet.ramey@case.edu>
Date: Thu, 13 Aug 2015 19:38:42 +0000 (-0400)
Subject: Bash-4.3 patch 42
X-Git-Tag: bash-4.4~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ae339e9c3c855a2bbd8f8667d4cf2999e3f06bfa;p=thirdparty%2Fbash.git

Bash-4.3 patch 42
---

diff --git a/parse.y b/parse.y
index 74b5927db..9cf7be808 100644
--- a/parse.y
+++ b/parse.y
@@ -3708,6 +3708,8 @@ eof_error:
 /*itrace("parse_comsub:%d: lex_inword -> 1 ch = `%c' (%d)", line_number, ch, __LINE__);*/
 	      tflags |= LEX_INWORD;
 	      lex_wlen = 0;
+	      if (tflags & LEX_RESWDOK)
+		lex_rwlen = 0;
 	    }
 	}
 
diff --git a/patchlevel.h b/patchlevel.h
index 44f59c772..9b7b0e572 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 41
+#define PATCHLEVEL 42
 
 #endif /* _PATCHLEVEL_H_ */
diff --git a/y.tab.c b/y.tab.c
index 4141e5dd0..b7264e27d 100644
--- a/y.tab.c
+++ b/y.tab.c
@@ -6020,6 +6020,8 @@ eof_error:
 /*itrace("parse_comsub:%d: lex_inword -> 1 ch = `%c' (%d)", line_number, ch, __LINE__);*/
 	      tflags |= LEX_INWORD;
 	      lex_wlen = 0;
+	      if (tflags & LEX_RESWDOK)
+		lex_rwlen = 0;
 	    }
 	}