diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-27 15:38:52 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-27 15:38:52 +0000 |
| commit | 64cf9f115322b760b9468f4c36233bd5aa275e2b (patch) | |
| tree | 7f0d534ff7c89f2dd9d7283ee42c71608ed14c20 /win32 | |
| parent | e3defadb7808f829c193e9d0842405cafca41ec4 (diff) | |
merge revision(s) 56310: [Backport #13364]
* win32/win32.c (poll_child_status): rb_w32_wait_events_blocking() sets
errno internally, then should not set it here.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@58162 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/win32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/win32/win32.c b/win32/win32.c index c99369f5ff..83dca48530 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -4264,7 +4264,6 @@ poll_child_status(struct ChildRecord *child, int *stat_loc) if (!GetExitCodeProcess(child->hProcess, &exitcode)) { /* If an error occurred, return immediately. */ - error_exit: err = GetLastError(); switch (err) { case ERROR_INVALID_PARAMETER: @@ -4277,6 +4276,7 @@ poll_child_status(struct ChildRecord *child, int *stat_loc) errno = map_errno(err); break; } + error_exit: CloseChildHandle(child); return -1; } |