From bc63a081829cb10b36a173907ed02e3c2374cd4b Mon Sep 17 00:00:00 2001 From: Chet Ramey Date: Fri, 28 Mar 2014 11:53:44 -0400 Subject: [PATCH] Bash-4.3 patch 5 --- parse.y | 2 +- patchlevel.h | 2 +- y.tab.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/parse.y b/parse.y index 82595de9a..83d5b9f20 100644 --- a/parse.y +++ b/parse.y @@ -3398,7 +3398,7 @@ parse_matched_pair (qc, open, close, lenp, flags) within a double-quoted ${...} construct "an even number of unescaped double-quotes or single-quotes, if any, shall occur." */ /* This was changed in Austin Group Interp 221 */ - if MBTEST(posixly_correct && shell_compatibility_level > 41 && dolbrace_state != DOLBRACE_QUOTE && (flags & P_DQUOTE) && (flags & P_DOLBRACE) && ch == '\'') + if MBTEST(posixly_correct && shell_compatibility_level > 41 && dolbrace_state != DOLBRACE_QUOTE && dolbrace_state != DOLBRACE_QUOTE2 && (flags & P_DQUOTE) && (flags & P_DOLBRACE) && ch == '\'') continue; /* Could also check open == '`' if we want to parse grouping constructs diff --git a/patchlevel.h b/patchlevel.h index 9a65c3738..11097c350 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 4 +#define PATCHLEVEL 5 #endif /* _PATCHLEVEL_H_ */ diff --git a/y.tab.c b/y.tab.c index f77131bec..709a56a3b 100644 --- a/y.tab.c +++ b/y.tab.c @@ -5710,7 +5710,7 @@ parse_matched_pair (qc, open, close, lenp, flags) within a double-quoted ${...} construct "an even number of unescaped double-quotes or single-quotes, if any, shall occur." */ /* This was changed in Austin Group Interp 221 */ - if MBTEST(posixly_correct && shell_compatibility_level > 41 && dolbrace_state != DOLBRACE_QUOTE && (flags & P_DQUOTE) && (flags & P_DOLBRACE) && ch == '\'') + if MBTEST(posixly_correct && shell_compatibility_level > 41 && dolbrace_state != DOLBRACE_QUOTE && dolbrace_state != DOLBRACE_QUOTE2 && (flags & P_DQUOTE) && (flags & P_DOLBRACE) && ch == '\'') continue; /* Could also check open == '`' if we want to parse grouping constructs -- 2.39.2