kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* win32/win32.c (waitpid): need to check the return value of

Browse source 
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
This commit is contained in:
usa 2012-04-24 08:05:25 +00:00
parent 5f34227718
commit 24f00be686
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Tue Apr 24 17:03:51 2012 NAKAMURA Usaku <usa@ruby-lang.org>
* 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.
Tue Apr 24 16:04:39 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Apr 24 16:04:39 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (parser_yylex): EXPR_BEG by keywords is a start point of * parse.y (parser_yylex): EXPR_BEG by keywords is a start point of

8
win32/win32.c
View file

@ -3921,6 +3921,7 @@ waitpid(rb_pid_t pid, int *stat_loc, int options)
int count = 0; int count = 0;
int ret; int ret;
HANDLE events[MAXCHILDNUM]; HANDLE events[MAXCHILDNUM];
struct ChildRecord* cause;
FOREACH_CHILD(child) { FOREACH_CHILD(child) {
if (!child->pid || child->pid < 0) continue; if (!child->pid || child->pid < 0) continue;
@ -3942,7 +3943,12 @@ waitpid(rb_pid_t pid, int *stat_loc, int options)
return -1; 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 { else {
struct ChildRecord* child = FindChildSlot(pid); struct ChildRecord* child = FindChildSlot(pid);