diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-25 17:32:17 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-25 17:32:17 +0000 |
commit | 8c34c05d241d69b80ddb67257041d1cb40cc9c72 (patch) | |
tree | 918342104b30516f6e056e853ee32d0bbcf39a67 | |
parent | f60e5af02dcddf1332ea2cb83e757dd77db2b504 (diff) | |
download | ruby-8c34c05d241d69b80ddb67257041d1cb40cc9c72.tar.gz |
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_2@58109 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | version.h | 2 | ||||
-rw-r--r-- | win32/win32.c | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sun Mar 26 02:32:12 2017 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/win32.c (poll_child_status): rb_w32_wait_events_blocking() sets + errno internally, then should not set it here. + Sun Mar 26 02:13:04 2017 Koichi Sasada <ko1@atdot.net> * test/ruby/test_exception.rb: fix thread issues. @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.7" #define RUBY_RELEASE_DATE "2017-03-26" -#define RUBY_PATCHLEVEL 441 +#define RUBY_PATCHLEVEL 442 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 3 diff --git a/win32/win32.c b/win32/win32.c index abd3bd6994..deb04965a2 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -4172,7 +4172,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: @@ -4185,6 +4184,7 @@ poll_child_status(struct ChildRecord *child, int *stat_loc) errno = map_errno(err); break; } + error_exit: CloseChildHandle(child); return -1; } |