From: Chet Ramey Date: Fri, 16 May 2014 18:17:23 +0000 (-0400) Subject: Bash-4.3 patch 12 X-Git-Tag: bash-4.4~35 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=4a741ca48131f9403afb163f5abf8af58aac4482;p=thirdparty%2Fbash.git Bash-4.3 patch 12 --- diff --git a/jobs.c b/jobs.c index 498201907..f38b0c3f4 100644 --- a/jobs.c +++ b/jobs.c @@ -3597,6 +3597,7 @@ run_sigchld_trap (nchild) unwind_protect_int (jobs_list_frozen); unwind_protect_pointer (the_pipeline); unwind_protect_pointer (subst_assign_varlist); + unwind_protect_pointer (this_shell_builtin); /* We have to add the commands this way because they will be run in reverse order of adding. We don't want maybe_set_sigchld_trap () diff --git a/patchlevel.h b/patchlevel.h index b7c2ff4c1..b5516c27b 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 11 +#define PATCHLEVEL 12 #endif /* _PATCHLEVEL_H_ */