From 1a1f8b54fb29c2af275253f35a7fcf79815222d5 Mon Sep 17 00:00:00 2001 From: Chet Ramey Date: Mon, 18 Aug 2014 11:45:31 -0400 Subject: [PATCH] Bash-4.3 patch 24 --- patchlevel.h | 2 +- subst.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/patchlevel.h b/patchlevel.h index 36672cb3b..9f74b87bb 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_ */ diff --git a/subst.c b/subst.c index b9317087a..70654e671 100644 --- a/subst.c +++ b/subst.c @@ -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); -- 2.39.2