]> git.ipfire.org Git - thirdparty/bash.git/commitdiff
Bash-5.0 patch 18: fix quoted null string removal when using shell word expansion...
authorChet Ramey <chet.ramey@case.edu>
Fri, 10 Jul 2020 15:29:25 +0000 (11:29 -0400)
committerChet Ramey <chet.ramey@case.edu>
Fri, 10 Jul 2020 15:29:25 +0000 (11:29 -0400)
patchlevel.h
subst.c

index 98e714da8ade026f11f000ded6eefc148ad26a95..f0ee56e4cb0819222c7cd7edf95bae3bcb48f8ec 100644 (file)
@@ -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 17
+#define PATCHLEVEL 18
 
 #endif /* _PATCHLEVEL_H_ */
diff --git a/subst.c b/subst.c
index 8884b4879e55d5a0345b28af98b07fcd6d60e75a..843c9d395d10b76ebc91de07d2b75d8c3bd885e5 100644 (file)
--- a/subst.c
+++ b/subst.c
@@ -5112,6 +5112,8 @@ getpattern (value, quoted, expandpat)
                                      (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) ? Q_PATQUOTE : quoted,
                                      (int *)NULL, (int *)NULL)
             : (WORD_LIST *)0;
+  if (l)
+    word_list_remove_quoted_nulls (l);
   pat = string_list (l);
   dispose_words (l);
   if (pat)