Bash-4.2 patch 32

diff --git a/patchlevel.h b/patchlevel.h
index eecb9f55755f34acedd9b86634b27e57c7bc7d43..70d815ad701970dabe1e71f5d2411686b4f39194 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 31
+#define PATCHLEVEL 32
 
 #endif /* _PATCHLEVEL_H_ */

diff --git a/subst.c b/subst.c
index fa4e5dc9a6562080cd87f4dcffa49872663bdf90..19151201e9b523ead11cb86d9350a82d8bef7274 100644 (file)
--- a/subst.c
+++ b/subst.c
@@ -8151,6 +8151,14 @@ add_string:
          temp = tword->word;
          dispose_word_desc (tword);
 
+         /* Kill quoted nulls; we will add them back at the end of
+            expand_word_internal if nothing else in the string */
+         if (had_quoted_null && temp && QUOTED_NULL (temp))
+           {
+             FREE (temp);
+             temp = (char *)NULL;
+           }
+
          goto add_string;
          break;
 
@@ -8555,7 +8563,7 @@ finished_with_string:
        tword->flags |= W_NOEXPAND;     /* XXX */
       if (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES))
        tword->flags |= W_QUOTED;
-      if (had_quoted_null)
+      if (had_quoted_null && QUOTED_NULL (istring))
        tword->flags |= W_HASQUOTEDNULL;
       list = make_word_list (tword, (WORD_LIST *)NULL);
     }
@@ -8586,7 +8594,7 @@ finished_with_string:
            tword->flags |= W_NOGLOB;
          if (word->flags & W_NOEXPAND)
            tword->flags |= W_NOEXPAND;
-         if (had_quoted_null)
+         if (had_quoted_null && QUOTED_NULL (istring))
            tword->flags |= W_HASQUOTEDNULL;    /* XXX */
          list = make_word_list (tword, (WORD_LIST *)NULL);
        }