diff options
| author | Chet Ramey <chet.ramey@case.edu> | 2014-10-02 22:50:19 -0400 |
|---|---|---|
| committer | Dan Pasanen <dan.pasanen@gmail.com> | 2014-10-04 15:25:22 -0500 |
| commit | a417a51c2855f8cd538532903fbcacd234589845 (patch) | |
| tree | 139d534ca59580cb9dadad0e68c5299287214b62 | |
| parent | 7e269734903a0849a47b1256fa17e461da14cdb7 (diff) | |
| download | android_external_bash-a417a51c2855f8cd538532903fbcacd234589845.tar.gz android_external_bash-a417a51c2855f8cd538532903fbcacd234589845.tar.bz2 android_external_bash-a417a51c2855f8cd538532903fbcacd234589845.zip | |
Bash-4.3 patch 29
| -rw-r--r-- | copy_cmd.c | 2 | ||||
| -rw-r--r-- | make_cmd.c | 1 | ||||
| -rw-r--r-- | patchlevel.h | 2 |
3 files changed, 3 insertions, 2 deletions
@@ -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: @@ -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_ */ |