From 24f00be686bdd5dc78a59b7566e85ab70796de01 Mon Sep 17 00:00:00 2001 From: usa Date: Tue, 24 Apr 2012 08:05:25 +0000 Subject: * win32/win32.c (waitpid): need to check the return value of FindChildSlotByHandle() before passing poll_child_status(). this fixed a SEGV in test-all. reported by ko1 via IRC. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35458 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- win32/win32.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'win32') diff --git a/win32/win32.c b/win32/win32.c index 7cbbaa2183..50387844ab 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -3921,6 +3921,7 @@ waitpid(rb_pid_t pid, int *stat_loc, int options) int count = 0; int ret; HANDLE events[MAXCHILDNUM]; + struct ChildRecord* cause; FOREACH_CHILD(child) { if (!child->pid || child->pid < 0) continue; @@ -3942,7 +3943,12 @@ waitpid(rb_pid_t pid, int *stat_loc, int options) return -1; } - return poll_child_status(FindChildSlotByHandle(events[ret]), stat_loc); + cause = FindChildSlotByHandle(events[ret]); + if (!cause) { + errno = ECHILD; + return -1; + } + return poll_child_status(cause, stat_loc); } else { struct ChildRecord* child = FindChildSlot(pid); -- cgit v1.2.3