From e4581d63ce1041b8b05ad29018ce72d47e933a27 Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 15 Dec 2004 05:32:53 +0000 Subject: * win32/win32.c (rb_w32_fdisset): check whether the handle is valid. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@7561 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ win32/win32.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 62d5ae177..911dea4e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Dec 15 14:32:18 2004 NAKAMURA Usaku + + * win32/win32.c (rb_w32_fdisset): check whether the handle is valid. + Tue Dec 14 19:17:15 2004 Yukihiro Matsumoto * utf8.c (utf8_is_mbc_ambiguous): [ruby-talk:123561] diff --git a/win32/win32.c b/win32/win32.c index 7a7078335..c21fca6fb 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -1827,7 +1827,12 @@ rb_w32_fdclr(int fd, fd_set *set) int rb_w32_fdisset(int fd, fd_set *set) { - return __WSAFDIsSet(TO_SOCKET(fd), set); + int ret; + SOCKET s = TO_SOCKET(fd); + if (s == (SOCKET)INVALID_HANDLE_VALUE) + return 0; + RUBY_CRITICAL(ret = __WSAFDIsSet(s, set)); + return ret; } // -- cgit