From: Chet Ramey <chet.ramey@case.edu>
Date: Fri, 3 Oct 2014 02:50:19 +0000 (-0400)
Subject: Bash-4.3 patch 29
X-Git-Tag: bash-4.4~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=13db572a82cffc5bf7326e27895c631ecf4316ae;p=thirdparty%2Fbash.git

Bash-4.3 patch 29
---

diff --git a/copy_cmd.c b/copy_cmd.c
index 911d34f3d..826e0c3a4 100644
--- a/copy_cmd.c
+++ b/copy_cmd.c
@@ -126,7 +126,7 @@ copy_redirect (redirect)
     {
     case r_reading_until:
     case r_deblank_reading_until:
-      new_redirect->here_doc_eof = savestring (redirect->here_doc_eof);
+      new_redirect->here_doc_eof = redirect->here_doc_eof ? savestring (redirect->here_doc_eof) : 0;
       /*FALLTHROUGH*/
     case r_reading_string:
     case r_appending_to:
diff --git a/make_cmd.c b/make_cmd.c
index 3bc540857..b01d08457 100644
--- a/make_cmd.c
+++ b/make_cmd.c
@@ -692,6 +692,7 @@ make_redirection (source, instruction, dest_and_filename, flags)
   /* First do the common cases. */
   temp->redirector = source;
   temp->redirectee = dest_and_filename;
+  temp->here_doc_eof = 0;
   temp->instruction = instruction;
   temp->flags = 0;
   temp->rflags = flags;
diff --git a/patchlevel.h b/patchlevel.h
index 96c13b39e..b6a4c574a 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 28
+#define PATCHLEVEL 29
 
 #endif /* _PATCHLEVEL_H_ */