]> git.ipfire.org Git - thirdparty/bash.git/commitdiff
Bash-4.2 patch 41
authorChet Ramey <chet.ramey@case.edu>
Fri, 11 Jan 2013 00:48:17 +0000 (19:48 -0500)
committerChet Ramey <chet.ramey@case.edu>
Fri, 11 Jan 2013 00:48:17 +0000 (19:48 -0500)
patchlevel.h
subst.c

index 85d224d05e5b1e96b4ec635316e934b3673a2221..d0523dc5e7d026207626bf8d7fdb130b8a9fb4a9 100644 (file)
@@ -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 937c71d94e02fa32a5fec6dc04f3b8f893e93aad..48c89c1fab4b2b050b54bd2fdff91ea9a17d2bb7 100644 (file)
--- 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)