bash.git - bash

diff --git a/patchlevel.h b/patchlevel.h
index b8e99ec9..816ef06b 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 6

+#define PATCHLEVEL 7

#endif /* _PATCHLEVEL_H_ */

diff --git a/subst.c b/subst.c
index a8ae174d..dd5d57bf 100644
--- a/subst.c
+++ b/subst.c

@@ -206,6 +206,8 @@ extern int wordexp_only;

extern int singlequote_translations;

extern int extended_quote;

+extern REDIRECT *exec_redirection_undo_list, *redirection_undo_list;

+

#if !defined (HAVE_WCSDUP) && defined (HANDLE_MULTIBYTE)

extern wchar_t *wcsdup (const wchar_t *);

#endif

@@ -7000,6 +7002,11 @@ function_substitute (char *string, int quoted, int flags)

add_unwind_protect (uw_restore_pipestatus_array, psa);

}

#endif

+

+ unwind_protect_pointer (redirection_undo_list);

+ redirection_undo_list = NULL;

+ unwind_protect_pointer (exec_redirection_undo_list);

+ exec_redirection_undo_list = NULL;

subst_assign_varlist = 0;