summaryrefslogtreecommitdiff
path: root/thread.c
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-08-16 04:43:40 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-08-16 04:43:40 +0000
commitbe4b713d53381cbaec2a9b3aeef0113eeacc172b (patch)
tree3f4e8186eca6bdaa846588e067aa350cd0c31f79 /thread.c
parent89594c0370bc85d60cd3a06c901316bdf33f60bf (diff)
merge revision(s) 55613: [Backport #12575]
* thread.c (rb_wait_for_single_fd): Clean up fds.revents every time before calling ppoll(2). [Bug #12575] [ruby-dev:49725] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@55924 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread.c')
-rw-r--r--thread.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/thread.c b/thread.c
index 0b89918eea..b6c5b35693 100644
--- a/thread.c
+++ b/thread.c
@@ -3620,6 +3620,7 @@ rb_wait_for_single_fd(int fd, int events, struct timeval *tv)
fds.events = (short)events;
retry:
+ fds.revents = 0;
lerrno = 0;
BLOCKING_REGION({
result = ppoll(&fds, 1, timeout, NULL);