You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
95 lines
3.4 KiB
95 lines
3.4 KiB
BASH PATCH REPORT
|
|
=================
|
|
|
|
Bash-Release: 4.3
|
|
Patch-ID: bash43-014
|
|
|
|
Bug-Reported-by: Greg Wooledge <wooledg@eeg.ccf.org>
|
|
Bug-Reference-ID: <20140418202123.GB7660@eeg.ccf.org>
|
|
Bug-Reference-URL: http://lists.gnu.org/archive/html/help-bash/2014-04/msg00004.html
|
|
|
|
Bug-Description:
|
|
|
|
Under certain circumstances, $@ is expanded incorrectly in contexts where
|
|
word splitting is not performed.
|
|
|
|
Patch (apply with `patch -p0'):
|
|
--- a/subst.c
|
|
+++ b/subst.c
|
|
@@ -3248,8 +3248,10 @@ cond_expand_word (w, special)
|
|
if (w->word == 0 || w->word[0] == '\0')
|
|
return ((char *)NULL);
|
|
|
|
+ expand_no_split_dollar_star = 1;
|
|
w->flags |= W_NOSPLIT2;
|
|
l = call_expand_word_internal (w, 0, 0, (int *)0, (int *)0);
|
|
+ expand_no_split_dollar_star = 0;
|
|
if (l)
|
|
{
|
|
if (special == 0) /* LHS */
|
|
@@ -7847,6 +7849,10 @@ param_expand (string, sindex, quoted, ex
|
|
We also want to make sure that splitting is done no matter what --
|
|
according to POSIX.2, this expands to a list of the positional
|
|
parameters no matter what IFS is set to. */
|
|
+ /* XXX - what to do when in a context where word splitting is not
|
|
+ performed? Even when IFS is not the default, posix seems to imply
|
|
+ that we behave like unquoted $* ? Maybe we should use PF_NOSPLIT2
|
|
+ here. */
|
|
temp = string_list_dollar_at (list, (pflags & PF_ASSIGNRHS) ? (quoted|Q_DOUBLE_QUOTES) : quoted);
|
|
|
|
tflag |= W_DOLLARAT;
|
|
@@ -8816,6 +8822,7 @@ finished_with_string:
|
|
else
|
|
{
|
|
char *ifs_chars;
|
|
+ char *tstring;
|
|
|
|
ifs_chars = (quoted_dollar_at || has_dollar_at) ? ifs_value : (char *)NULL;
|
|
|
|
@@ -8830,11 +8837,36 @@ finished_with_string:
|
|
regardless of what else has happened to IFS since the expansion. */
|
|
if (split_on_spaces)
|
|
list = list_string (istring, " ", 1); /* XXX quoted == 1? */
|
|
+ /* If we have $@ (has_dollar_at != 0) and we are in a context where we
|
|
+ don't want to split the result (W_NOSPLIT2), and we are not quoted,
|
|
+ we have already separated the arguments with the first character of
|
|
+ $IFS. In this case, we want to return a list with a single word
|
|
+ with the separator possibly replaced with a space (it's what other
|
|
+ shells seem to do).
|
|
+ quoted_dollar_at is internal to this function and is set if we are
|
|
+ passed an argument that is unquoted (quoted == 0) but we encounter a
|
|
+ double-quoted $@ while expanding it. */
|
|
+ else if (has_dollar_at && quoted_dollar_at == 0 && ifs_chars && quoted == 0 && (word->flags & W_NOSPLIT2))
|
|
+ {
|
|
+ /* Only split and rejoin if we have to */
|
|
+ if (*ifs_chars && *ifs_chars != ' ')
|
|
+ {
|
|
+ list = list_string (istring, *ifs_chars ? ifs_chars : " ", 1);
|
|
+ tstring = string_list (list);
|
|
+ }
|
|
+ else
|
|
+ tstring = istring;
|
|
+ tword = make_bare_word (tstring);
|
|
+ if (tstring != istring)
|
|
+ free (tstring);
|
|
+ goto set_word_flags;
|
|
+ }
|
|
else if (has_dollar_at && ifs_chars)
|
|
list = list_string (istring, *ifs_chars ? ifs_chars : " ", 1);
|
|
else
|
|
{
|
|
tword = make_bare_word (istring);
|
|
+set_word_flags:
|
|
if ((quoted & (Q_DOUBLE_QUOTES|Q_HERE_DOCUMENT)) || (quoted_state == WHOLLY_QUOTED))
|
|
tword->flags |= W_QUOTED;
|
|
if (word->flags & W_ASSIGNMENT)
|
|
--- 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 13
|
|
+#define PATCHLEVEL 14
|
|
|
|
#endif /* _PATCHLEVEL_H_ */
|