usa	2008-11-11 17:54:07 +0900 (Tue, 11 Nov 2008)

  New Revision: 20189

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=20189

  Log:
    * 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]

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/win32/win32.c
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/win32/win32.c
    trunk/ChangeLog
    trunk/win32/win32.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 20188)
+++ ChangeLog	(revision 20189)
@@ -1,3 +1,10 @@
+Tue Nov 11 17:35:25 2008  NAKAMURA Usaku  <usa@r...>
+
+	* 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]
+
 Tue Nov 11 14:40:40 2008  Martin Duerst  <duerst@i...>
 
 	* test/ruby/test_transcode.rb: unnecessary setup method
Index: win32/win32.c
===================================================================
--- win32/win32.c	(revision 20188)
+++ win32/win32.c	(revision 20189)
@@ -2296,25 +2296,33 @@
 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
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 20188)
+++ ruby_1_8/ChangeLog	(revision 20189)
@@ -1,3 +1,10 @@
+Tue Nov 11 17:51:30 2008  NAKAMURA Usaku  <usa@r...>
+
+	* 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]
+
 Mon Nov 10 18:06:51 2008  Akinori MUSHA  <knu@i...>
 
 	* ext/dbm/dbm.c (fdbm_key): Rename #index to #key.  Emit a warning
Index: ruby_1_8/win32/win32.c
===================================================================
--- ruby_1_8/win32/win32.c	(revision 20188)
+++ ruby_1_8/win32/win32.c	(revision 20189)
@@ -2379,21 +2379,32 @@
 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;
+	HANDLE h = CreateFile("NUL", 0, 0, NULL, OPEN_ALWAYS, 0, NULL);
+	fd = rb_w32_open_osfhandle((long)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);
+	    }
+	    else {
+		errno = map_errno(WSAGetLastError());
+		close(fd);
+		fd = -1;
+	    }
 	}
-	else {
-	    s = rb_w32_open_osfhandle(r, O_RDWR|O_BINARY);
-	}
+	else
+	    CloseHandle(h);
     });
-    return s;
+    return fd;
 }
 
 #undef bind
Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20188)
+++ ruby_1_9_1/ChangeLog	(revision 20189)
@@ -1,3 +1,10 @@
+Tue Nov 11 17:37:47 2008  NAKAMURA Usaku  <usa@r...>
+
+	* 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@r...>
 
 	* safe.c (safe_setter): add warning for $SAFE=3.
Index: ruby_1_9_1/win32/win32.c
===================================================================
--- ruby_1_9_1/win32/win32.c	(revision 20188)
+++ ruby_1_9_1/win32/win32.c	(revision 20189)
@@ -2296,25 +2296,30 @@
 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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/