Bash-4.3 patch 42

diff --git a/parse.y b/parse.y
index 74b5927dbf1e87b137d1dba4bfa1d6f167614ec0..9cf7be80873964273c9b8a186e86beea0b562170 100644 (file)
--- 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 44f59c772a5797e69948e468c9d8117177f75fc0..9b7b0e572c5341b347056c8a10376ab87ef107b4 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 41
+#define PATCHLEVEL 42
 
 #endif /* _PATCHLEVEL_H_ */

diff --git a/y.tab.c b/y.tab.c
index 4141e5dd00e51f9bddcf206cdce0fac8a745e7eb..b7264e27ddd0b8ee2315ffc7c9da5723f529e236 100644 (file)
--- 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;
            }
        }