Bash-4.2 patch 13

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

diff --git a/subst.c b/subst.c
index b23610eeb657f0e2429acc7f7f63bf87c0c2808d..df25f632a9d4bdc0c14f042fa28bef9b6eab5b9e 100644 (file)
--- a/subst.c
+++ b/subst.c
@@ -3706,7 +3706,10 @@ remove_quoted_nulls (string)
            break;
        }
       else if (string[i] == CTLNUL)
-       i++;
+       {
+         i++;
+         continue;
+       }
 
       prev_i = i;
       ADVANCE_CHAR (string, slen, i);