summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChet Ramey <chet.ramey@case.edu>2013-01-10 19:48:17 -0500
committerChet Ramey <chet.ramey@case.edu>2013-01-10 19:48:17 -0500
commit8dea6e878b47519840d57eb215945f3e1fac7421 (patch)
tree24b97085d6b1ddcd997e63d433bb75e259a4131e
parent774d3bf69d419308d56f7082d8bc87bbc90abe74 (diff)
downloadbash-8dea6e878b47519840d57eb215945f3e1fac7421.tar.gz
Bash-4.2 patch 41
-rw-r--r--patchlevel.h2
-rw-r--r--subst.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/patchlevel.h b/patchlevel.h
index 85d224d0..d0523dc5 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 40
+#define PATCHLEVEL 41
#endif /* _PATCHLEVEL_H_ */
diff --git a/subst.c b/subst.c
index 937c71d9..48c89c1f 100644
--- a/subst.c
+++ b/subst.c
@@ -5124,6 +5124,10 @@ process_substitute (string, open_for_read_in_child)
dev_fd_list[parent_pipe_fd] = 0;
#endif /* HAVE_DEV_FD */
+ /* subshells shouldn't have this flag, which controls using the temporary
+ environment for variable lookups. */
+ expanding_redir = 0;
+
result = parse_and_execute (string, "process substitution", (SEVAL_NONINT|SEVAL_NOHIST));
#if !defined (HAVE_DEV_FD)