summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChet Ramey <chet.ramey@case.edu>2011-11-22 20:02:41 -0500
committerChet Ramey <chet.ramey@case.edu>2011-11-22 20:02:41 -0500
commita48a8ac3526e4395f086945cf986d0fea378870b (patch)
tree2d115063fea0216a40b35c43d9f1c7160f6429dd
parentb4839c27f75ca05d8a26144df76e17cf71ee648f (diff)
downloadbash-a48a8ac3526e4395f086945cf986d0fea378870b.tar.gz
Bash-4.2 patch 13
-rw-r--r--patchlevel.h2
-rw-r--r--subst.c5
2 files changed, 5 insertions, 2 deletions
diff --git a/patchlevel.h b/patchlevel.h
index c6a76151..636be1cc 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 12
+#define PATCHLEVEL 13
#endif /* _PATCHLEVEL_H_ */
diff --git a/subst.c b/subst.c
index b23610ee..df25f632 100644
--- 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);