From 13db572a82cffc5bf7326e27895c631ecf4316ae Mon Sep 17 00:00:00 2001 From: Chet Ramey Date: Thu, 2 Oct 2014 22:50:19 -0400 Subject: [PATCH] Bash-4.3 patch 29 --- copy_cmd.c | 2 +- make_cmd.c | 1 + patchlevel.h | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/copy_cmd.c b/copy_cmd.c index 911d34f..826e0c3 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 3bc5408..b01d084 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 96c13b3..b6a4c57 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_ */ -- 2.7.4