aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2013-08-18 22:46:17 -0700
committerPaul Eggert2013-08-18 22:46:17 -0700
commit2249012558e589b9382e068326116dbd909bbb81 (patch)
treed0dc21c14c5d642bef5da058c572655be954df07 /src
parent51632863c2551d06415e541235d90c66fd3e8def (diff)
downloademacs-2249012558e589b9382e068326116dbd909bbb81.tar.gz
emacs-2249012558e589b9382e068326116dbd909bbb81.zip
* process.c (handle_child_signal): Fix crash; deleted pid.
This was introduced by my 2013-08-12 fix for Bug#15035. Fixes: debbugs:15106
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/process.c5
2 files changed, 9 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 0f68f36a8c9..0203ce636ef 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12013-08-19 Paul Eggert <eggert@cs.ucla.edu>
2
3 * process.c (handle_child_signal): Fix crash; deleted pid (Bug#15106).
4 This was introduced by my 2013-08-12 fix for Bug#15035.
5
12013-08-19 Dmitry Antipov <dmantipov@yandex.ru> 62013-08-19 Dmitry Antipov <dmantipov@yandex.ru>
2 7
3 * image.c (imagemagick_create_cache, imagemagick_get_animation_cache) 8 * image.c (imagemagick_create_cache, imagemagick_get_animation_cache)
diff --git a/src/process.c b/src/process.c
index 64cb401c06a..c4dd87a6b48 100644
--- a/src/process.c
+++ b/src/process.c
@@ -6153,7 +6153,10 @@ handle_child_signal (int sig)
6153 = (MOST_NEGATIVE_FIXNUM <= TYPE_MINIMUM (pid_t) 6153 = (MOST_NEGATIVE_FIXNUM <= TYPE_MINIMUM (pid_t)
6154 && TYPE_MAXIMUM (pid_t) <= MOST_POSITIVE_FIXNUM); 6154 && TYPE_MAXIMUM (pid_t) <= MOST_POSITIVE_FIXNUM);
6155 Lisp_Object head = XCAR (tail); 6155 Lisp_Object head = XCAR (tail);
6156 Lisp_Object xpid = XCAR (head); 6156 Lisp_Object xpid;
6157 if (! CONSP (head))
6158 continue;
6159 xpid = XCAR (head);
6157 if (all_pids_are_fixnums ? INTEGERP (xpid) : NUMBERP (xpid)) 6160 if (all_pids_are_fixnums ? INTEGERP (xpid) : NUMBERP (xpid))
6158 { 6161 {
6159 pid_t deleted_pid; 6162 pid_t deleted_pid;