diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | win32/win32.c | 27 |
2 files changed, 23 insertions, 11 deletions
@@ -1,3 +1,10 @@ +Tue Nov 11 17:37:47 2008 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/win32.c (rb_w32_accept): secure fd before accept because if + error causes in securing, cannot restore the state of accepted + socket. + fixed [ruby-core:19728] + Sat Nov 8 05:31:25 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * safe.c (safe_setter): add warning for $SAFE=3. diff --git a/win32/win32.c b/win32/win32.c index ae692ce9f0..f9333d0283 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -2296,25 +2296,30 @@ int WSAAPI rb_w32_accept(int s, struct sockaddr *addr, int *addrlen) { SOCKET r; + int fd; if (!NtSocketsInitialized) { StartSockets(); } RUBY_CRITICAL({ - r = accept(TO_SOCKET(s), addr, addrlen); - if (r == INVALID_SOCKET) { - errno = map_errno(WSAGetLastError()); - s = -1; - } - else { - s = rb_w32_open_osfhandle(r, O_RDWR|O_BINARY|O_NOINHERIT); - if (s != -1) + HANDLE h = CreateFile("NUL", 0, 0, NULL, OPEN_ALWAYS, 0, NULL); + fd = rb_w32_open_osfhandle((intptr_t)h, O_RDWR|O_BINARY|O_NOINHERIT); + if (fd != -1) { + r = accept(TO_SOCKET(s), addr, addrlen); + if (r != INVALID_SOCKET) { + MTHREAD_ONLY(EnterCriticalSection(&(_pioinfo(fd)->lock))); + _set_osfhnd(fd, r); + MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock)); st_insert(socklist, (st_data_t)r, (st_data_t)0); - else - closesocket(r); + } + else { + errno = map_errno(WSAGetLastError()); + close(fd); + fd = -1; + } } }); - return s; + return fd; } #undef bind |