Merge pull request #4835 from dibdot/adblock
[feed/packages.git] / utils / bash / patches / 124-upstream-bash43-024.patch
1 BASH PATCH REPORT
2 =================
3
4 Bash-Release: 4.3
5 Patch-ID: bash43-024
6
7 Bug-Reported-by: Corentin Peuvrel <cpeuvrel@pom-monitoring.com>
8 Bug-Reference-ID: <53CE9E5D.6050203@pom-monitoring.com>
9 Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-07/msg00021.html
10
11 Bug-Description:
12
13 Indirect variable references do not work correctly if the reference
14 variable expands to an array reference using a subscript other than 0
15 (e.g., foo='bar[1]' ; echo ${!foo}).
16
17 Patch (apply with `patch -p0'):
18
19 --- a/subst.c
20 +++ b/subst.c
21 @@ -7374,7 +7374,13 @@ parameter_brace_expand (string, indexp,
22 }
23
24 if (want_indir)
25 - tdesc = parameter_brace_expand_indir (name + 1, var_is_special, quoted, quoted_dollar_atp, contains_dollar_at);
26 + {
27 + tdesc = parameter_brace_expand_indir (name + 1, var_is_special, quoted, quoted_dollar_atp, contains_dollar_at);
28 + /* Turn off the W_ARRAYIND flag because there is no way for this function
29 + to return the index we're supposed to be using. */
30 + if (tdesc && tdesc->flags)
31 + tdesc->flags &= ~W_ARRAYIND;
32 + }
33 else
34 tdesc = parameter_brace_expand_word (name, var_is_special, quoted, PF_IGNUNBOUND|(pflags&(PF_NOSPLIT2|PF_ASSIGNRHS)), &ind);
35
36 --- a/patchlevel.h
37 +++ b/patchlevel.h
38 @@ -25,6 +25,6 @@
39 regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
40 looks for to find the patch level (for the sccs version string). */
41
42 -#define PATCHLEVEL 23
43 +#define PATCHLEVEL 24
44
45 #endif /* _PATCHLEVEL_H_ */