Bash-4.2 patch 14

diff --git a/patchlevel.h b/patchlevel.h
index 636be1ccd2b3dadeadbbd7c5ef0f1a28ac84b331..04b423b56701a39e659a27edcff733b59f04a795 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 13
+#define PATCHLEVEL 14
 
 #endif /* _PATCHLEVEL_H_ */

diff --git a/pathexp.c b/pathexp.c
index 42f21e4c86edbb0d977ee75f941b5fd654bda4e0..f23995684acbe42a25af6bb4e7e68594890edc11 100644 (file)
--- 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++;