From 9ccc9cfaf3edbf4ce5be9317f402e5d0b48256fd Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 15 Dec 2004 02:06:26 +0000 Subject: * win32/win32.c (rb_w32_fdisset): check whether fd is socket. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7558 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ win32/win32.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0fd04bbb5c..f90be81a9b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Dec 15 11:03:40 2004 NAKAMURA Usaku + + * win32/win32.c (rb_w32_fdisset): check whether fd is socket. + Wed Dec 15 10:30:37 2004 Yukihiro Matsumoto * ext/openssl/ossl_digest.c (ossl_digest_initialize): [ruby-dev:25198] diff --git a/win32/win32.c b/win32/win32.c index 1a859a5a3f..53f8dc9c25 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -1811,7 +1811,10 @@ rb_w32_fdclr(int fd, fd_set *set) int rb_w32_fdisset(int fd, fd_set *set) { - return __WSAFDIsSet(TO_SOCKET(fd), set); + SOCKET s = TO_SOCKET(fd); + if (!is_socket(s)) + return 0; + return __WSAFDIsSet(s, set); } // -- cgit v1.2.3