mirror of
https://github.com/novatiq/packages.git
synced 2026-04-29 06:58:39 +01:00
Marcel Denia
70 lines
2.2 KiB
Diff
70 lines
2.2 KiB
Diff
BASH PATCH REPORT
|
|
=================
|
|
|
|
Bash-Release: 4.2
|
|
Patch-ID: bash42-036
|
|
|
|
Bug-Reported-by: gregrwm <backuppc-users@whitleymott.net>
|
|
Bug-Reference-ID: <CAD+dB9B4JG+qUwZBQUwiQmVt0j6NDn=DDTxr9R+nkA8DL4KLJA@mail.gmail.com>
|
|
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-05/msg00108.html
|
|
|
|
Bug-Description:
|
|
|
|
Bash-4.2 produces incorrect word splitting results when expanding
|
|
double-quoted $@ in the same string as and adjacent to other variable
|
|
expansions. The $@ should be split, the other expansions should not.
|
|
|
|
Patch (apply with `patch -p0'):
|
|
|
|
--- a/subst.c
|
|
+++ b/subst.c
|
|
@@ -7922,7 +7922,7 @@ expand_word_internal (word, quoted, isex
|
|
|
|
/* State flags */
|
|
int had_quoted_null;
|
|
- int has_dollar_at;
|
|
+ int has_dollar_at, temp_has_dollar_at;
|
|
int tflag;
|
|
int pflags; /* flags passed to param_expand */
|
|
|
|
@@ -8127,13 +8127,14 @@ add_string:
|
|
if (expanded_something)
|
|
*expanded_something = 1;
|
|
|
|
- has_dollar_at = 0;
|
|
+ temp_has_dollar_at = 0;
|
|
pflags = (word->flags & W_NOCOMSUB) ? PF_NOCOMSUB : 0;
|
|
if (word->flags & W_NOSPLIT2)
|
|
pflags |= PF_NOSPLIT2;
|
|
tword = param_expand (string, &sindex, quoted, expanded_something,
|
|
- &has_dollar_at, "ed_dollar_at,
|
|
+ &temp_has_dollar_at, "ed_dollar_at,
|
|
&had_quoted_null, pflags);
|
|
+ has_dollar_at += temp_has_dollar_at;
|
|
|
|
if (tword == &expand_wdesc_error || tword == &expand_wdesc_fatal)
|
|
{
|
|
@@ -8274,9 +8275,10 @@ add_twochars:
|
|
|
|
temp = (char *)NULL;
|
|
|
|
- has_dollar_at = 0;
|
|
+ temp_has_dollar_at = 0; /* XXX */
|
|
/* Need to get W_HASQUOTEDNULL flag through this function. */
|
|
- list = expand_word_internal (tword, Q_DOUBLE_QUOTES, 0, &has_dollar_at, (int *)NULL);
|
|
+ list = expand_word_internal (tword, Q_DOUBLE_QUOTES, 0, &temp_has_dollar_at, (int *)NULL);
|
|
+ has_dollar_at += temp_has_dollar_at;
|
|
|
|
if (list == &expand_word_error || list == &expand_word_fatal)
|
|
{
|
|
--- 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 35
|
|
+#define PATCHLEVEL 36
|
|
|
|
#endif /* _PATCHLEVEL_H_ */
|