From: Chet Ramey <chet.ramey@case.edu>
Date: Mon, 7 May 2012 20:23:39 +0000 (-0400)
Subject: Bash-4.2 patch 28
X-Git-Tag: bash-4.3~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cd110fdfc29a8766f71a8f9fbb0e011b83d23763;p=thirdparty%2Fbash.git

Bash-4.2 patch 28
---

diff --git a/patchlevel.h b/patchlevel.h
index 5e31cd4a0..a2be105b5 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 27
+#define PATCHLEVEL 28
 
 #endif /* _PATCHLEVEL_H_ */
diff --git a/subst.c b/subst.c
index b6476d8a7..fa4e5dc9a 100644
--- a/subst.c
+++ b/subst.c
@@ -5809,6 +5809,16 @@ parameter_brace_expand_rhs (name, value, c, quoted, qdollaratp, hasdollarat)
 	 is the only expansion that creates more than one word. */
       if (qdollaratp && ((hasdol && quoted) || l->next))
 	*qdollaratp = 1;
+      /* If we have a quoted null result (QUOTED_NULL(temp)) and the word is
+	 a quoted null (l->next == 0 && QUOTED_NULL(l->word->word)), the
+	 flags indicate it (l->word->flags & W_HASQUOTEDNULL), and the
+	 expansion is quoted (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES))
+	 (which is more paranoia than anything else), we need to return the
+	 quoted null string and set the flags to indicate it. */
+      if (l->next == 0 && (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) && QUOTED_NULL(temp) && QUOTED_NULL(l->word->word) && (l->word->flags & W_HASQUOTEDNULL))
+	{
+	  w->flags |= W_HASQUOTEDNULL;
+	}
       dispose_words (l);
     }
   else if ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) && hasdol)