Fix incorrect assertion

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

Fix incorrect assertion
* process.c (catch_child_signal): Fix incorrect assertion.
f26d02a6 · Andreas Schwab · fce9e553 · f26d02a6 · f26d02a6
Commit f26d02a6 authored Nov 02, 2014 by Andreas Schwab
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

src/ChangeLog src/ChangeLog +4 -0

src/process.c src/process.c +2 -1

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+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):

--- 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