summaryrefslogtreecommitdiff
path: root/lib/malloc/malloc.c
diff options
context:
space:
mode:
authorChet Ramey <chet.ramey@case.edu>2013-03-26 20:51:22 -0400
committerChet Ramey <chet.ramey@case.edu>2013-03-26 20:51:22 -0400
commitc7e43312f9b44c8aeb42b99152cc3e5dcac89a46 (patch)
tree449335a1e8d14a2c3e73fb247b818b72bef69b27 /lib/malloc/malloc.c
parent8eb22ee966b0276194bbda0d6c8b109f4636edd3 (diff)
downloadbash-c7e43312f9b44c8aeb42b99152cc3e5dcac89a46.tar.gz
commit bash-20130301 snapshot
Diffstat (limited to 'lib/malloc/malloc.c')
-rw-r--r--lib/malloc/malloc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/malloc/malloc.c b/lib/malloc/malloc.c
index 1c92ca67..cd987c0d 100644
--- a/lib/malloc/malloc.c
+++ b/lib/malloc/malloc.c
@@ -562,7 +562,11 @@ morecore (nu)
/* Block all signals in case we are executed from a signal handler. */
blocked_sigs = 0;
#ifdef SHELL
+# if defined (SIGCHLD)
if (interrupt_immediately || running_trap || signal_is_trapped (SIGINT) || signal_is_trapped (SIGCHLD))
+# else
+ if (interrupt_immediately || running_trap || signal_is_trapped (SIGINT))
+# endif
#endif
{
_malloc_block_signals (&set, &oset);