diff options
| author | Chet Ramey <chet.ramey@case.edu> | 2014-08-18 11:45:31 -0400 |
|---|---|---|
| committer | Chet Ramey <chet.ramey@case.edu> | 2014-08-18 11:45:31 -0400 |
| commit | 1a1f8b54fb29c2af275253f35a7fcf79815222d5 (patch) | |
| tree | d5a5a93d9c092910caafb6c4be0630a88c002010 | |
| parent | 85b94814db40fa40856fb80c18f0dcbf62a75a75 (diff) | |
| download | android_external_bash-1a1f8b54fb29c2af275253f35a7fcf79815222d5.tar.gz android_external_bash-1a1f8b54fb29c2af275253f35a7fcf79815222d5.tar.bz2 android_external_bash-1a1f8b54fb29c2af275253f35a7fcf79815222d5.zip | |
Bash-4.3 patch 24
| -rw-r--r-- | patchlevel.h | 2 | ||||
| -rw-r--r-- | subst.c | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/patchlevel.h b/patchlevel.h index 36672cb..9f74b87 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 23 +#define PATCHLEVEL 24 #endif /* _PATCHLEVEL_H_ */ @@ -7374,7 +7374,13 @@ parameter_brace_expand (string, indexp, quoted, pflags, quoted_dollar_atp, conta } if (want_indir) - tdesc = parameter_brace_expand_indir (name + 1, var_is_special, quoted, quoted_dollar_atp, contains_dollar_at); + { + tdesc = parameter_brace_expand_indir (name + 1, var_is_special, quoted, quoted_dollar_atp, contains_dollar_at); + /* Turn off the W_ARRAYIND flag because there is no way for this function + to return the index we're supposed to be using. */ + if (tdesc && tdesc->flags) + tdesc->flags &= ~W_ARRAYIND; + } else tdesc = parameter_brace_expand_word (name, var_is_special, quoted, PF_IGNUNBOUND|(pflags&(PF_NOSPLIT2|PF_ASSIGNRHS)), &ind); |