Fix incorrect assertion

* process.c (catch_child_signal): Fix incorrect assertion.

diff --git a/src/ChangeLog b/src/ChangeLog
index e79bcb7080aec014135ed07a53b47ae29da1bdb4..62656d06354bff6b3a3f5b1da0ae3cfc73b6a165 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-02  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * process.c (catch_child_signal): Fix incorrect assertion.
+
 2014-11-01  Jan Djärv  <jan.h.d@swipnet.se>
 
        * macfont.m (macfont_draw):

diff --git a/src/process.c b/src/process.c
index 06fc918cf54c1dd946b79526c7c90a7ad3fc7699..6eae5166465e824ffcb38f24e8aa60648ae164b7 100644 (file)
--- a/src/process.c
+++ b/src/process.c
@@ -7092,7 +7092,8 @@ catch_child_signal (void)
   emacs_sigaction_init (&action, deliver_child_signal);
   block_child_signal (&oldset);
   sigaction (SIGCHLD, &action, &old_action);
-  eassert (! (old_action.sa_flags & SA_SIGINFO));
+  eassert (old_action.sa_handler == SIG_DFL || old_action.sa_handler == SIG_IGN
+          || ! (old_action.sa_flags & SA_SIGINFO));
 
   if (old_action.sa_handler != deliver_child_signal)
     lib_child_handler