diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-11 08:54:07 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-11 08:54:07 +0000 |
| commit | 9c77b85da9da9fb75d426a6a18d08960ae72920c (patch) | |
| tree | 40693434b91eadff4f090f7d08995bdfeb71680f /win32 | |
| parent | 95cf64975291bee904287f2b0e8ee58aeac8891e (diff) | |
| download | ruby-9c77b85da9da9fb75d426a6a18d08960ae72920c.tar.gz ruby-9c77b85da9da9fb75d426a6a18d08960ae72920c.tar.xz ruby-9c77b85da9da9fb75d426a6a18d08960ae72920c.zip | |
* 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]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@20189 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/win32.c | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/win32/win32.c b/win32/win32.c index ae692ce9f..f2129afac 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -2296,25 +2296,33 @@ 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)); + CloseHandle(h); st_insert(socklist, (st_data_t)r, (st_data_t)0); - else - closesocket(r); + } + else { + errno = map_errno(WSAGetLastError()); + close(fd); + fd = -1; + } } + else + CloseHandle(h); }); - return s; + return fd; } #undef bind |