From: Chet Ramey <chet.ramey@case.edu>
Date: Sat, 19 Dec 2020 19:29:01 +0000 (-0500)
Subject: Bash-5.1 patch 3: fix command substitution in here-document from child process in... 
X-Git-Tag: bash-5.2-alpha~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a042c731eecd6c6f5c488fa3187af28b18a6c905;p=thirdparty%2Fbash.git

Bash-5.1 patch 3: fix command substitution in here-document from child process in wrong process group
---

diff --git a/patchlevel.h b/patchlevel.h
index 8a1835518..e4d85cf8b 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 2
+#define PATCHLEVEL 3
 
 #endif /* _PATCHLEVEL_H_ */
diff --git a/subst.c b/subst.c
index 9ccbf3366..23f847f41 100644
--- a/subst.c
+++ b/subst.c
@@ -6356,8 +6356,10 @@ command_substitute (string, quoted, flags)
 
 #if defined (JOB_CONTROL)
   old_pipeline_pgrp = pipeline_pgrp;
-  /* Don't reset the pipeline pgrp if we're already a subshell in a pipeline. */
-  if ((subshell_environment & SUBSHELL_PIPE) == 0)
+  /* Don't reset the pipeline pgrp if we're already a subshell in a pipeline or
+     we've already forked to run a disk command (and are expanding redirections,
+     for example). */
+  if ((subshell_environment & (SUBSHELL_FORK|SUBSHELL_PIPE)) == 0)
     pipeline_pgrp = shell_pgrp;
   cleanup_the_pipeline ();
 #endif /* JOB_CONTROL */