emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

scratch/sigchld-fd df34ed8 2/2: Don't crash if no asynchronous process h


From: Philipp Stephani
Subject: scratch/sigchld-fd df34ed8 2/2: Don't crash if no asynchronous process has been created yet.
Date: Sat, 16 Jan 2021 13:49:49 -0500 (EST)

branch: scratch/sigchld-fd
commit df34ed8cbfdcf4584aa0ebfe827fac3a8d932bb6
Author: Philipp Stephani <phst@google.com>
Commit: Philipp Stephani <phst@google.com>

    Don't crash if no asynchronous process has been created yet.
    
    * src/process.c (wait_reading_process_output): Allow
    child_signal_read_fd < 0.
---
 src/process.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/process.c b/src/process.c
index 474c870..aca87f8 100644
--- a/src/process.c
+++ b/src/process.c
@@ -5413,9 +5413,9 @@ wait_reading_process_output (intmax_t time_limit, int 
nsecs, int read_kbd,
         an asynchronous process.  Otherwise this might deadlock if we
         receive a SIGCHLD during `pselect'.  */
       int child_fd = child_signal_read_fd;
-      eassert (0 <= child_fd);
       eassert (child_fd < FD_SETSIZE);
-      FD_SET (child_fd, &Available);
+      if (0 <= child_fd)
+        FD_SET (child_fd, &Available);
 
       /* If frame size has changed or the window is newly mapped,
         redisplay now, before we start to wait.  There is a race



reply via email to

[Prev in Thread] Current Thread [Next in Thread]