From: Chet Ramey <chet.ramey@case.edu>
Date: Wed, 23 Nov 2011 01:02:46 +0000 (-0500)
Subject: Bash-4.2 patch 14
X-Git-Tag: bash-4.3~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=25db9a70d4c2ba5c43d4167f231bdd8d760d5a06;p=thirdparty%2Fbash.git

Bash-4.2 patch 14
---

diff --git a/patchlevel.h b/patchlevel.h
index 636be1ccd..04b423b56 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 13
+#define PATCHLEVEL 14
 
 #endif /* _PATCHLEVEL_H_ */
diff --git a/pathexp.c b/pathexp.c
index 42f21e4c8..f23995684 100644
--- a/pathexp.c
+++ b/pathexp.c
@@ -196,7 +196,7 @@ quote_string_for_globbing (pathname, qflags)
 	{
 	  if ((qflags & QGLOB_FILENAME) && pathname[i+1] == '/')
 	    continue;
-	  if ((qflags & QGLOB_REGEXP) && ere_char (pathname[i+1]) == 0)
+	  if (pathname[i+1] != CTLESC && (qflags & QGLOB_REGEXP) && ere_char (pathname[i+1]) == 0)
 	    continue;
 	  temp[j++] = '\\';
 	  i++;