aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChet Ramey <chet.ramey@case.edu>2014-05-16 14:17:23 -0400
committerChet Ramey <chet.ramey@case.edu>2014-05-16 14:17:23 -0400
commit4a741ca48131f9403afb163f5abf8af58aac4482 (patch)
treec191df10f170de275bfeeb2d04b669310db2019d
parentb7ec1810367e42788ded6c2fb99db698bd26ccf1 (diff)
downloadandroid_external_bash-4a741ca48131f9403afb163f5abf8af58aac4482.tar.gz
android_external_bash-4a741ca48131f9403afb163f5abf8af58aac4482.tar.bz2
android_external_bash-4a741ca48131f9403afb163f5abf8af58aac4482.zip
Bash-4.3 patch 12
-rw-r--r--jobs.c1
-rw-r--r--patchlevel.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/jobs.c b/jobs.c
index 4982019..f38b0c3 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 b7c2ff4..b5516c2 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_ */