0
@@ -1,3 +1,11 @@
0
+Thu Jul 24 16:30:21 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
0
+
0
+	* win32/win32.c (exit_handler): use st_free_table() to free socklist.
0
+
0
+	* win32/win32.c (rb_w32_pipe_exec, rb_w32_accept, rb_w32_socket,
0
+	  rb_w32_socketpair): should check and release fd and sockets/handles
0
+	  if an error occurs in rb_w32_open_osfhandle().
0
+
0
 Thu Jul 24 16:05:02 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
0
 
0
   * win32/win32.c (overlapped_socket_io): avoid warnings.

0
@@ -439,7 +439,7 @@ exit_handler(void)
0
 {
0
     if (NtSocketsInitialized) {
0
   WSACleanup();
0
-	xfree(socklist);
0
+	st_free_table(socklist);
0
   socklist = NULL;
0
   NtSocketsInitialized = 0;
0
     }
0
@@ -751,10 +751,9 @@ rb_w32_join_argv(char *cmd, char *const *argv)
0
     return cmd;
0
 }
0
 
0
-static int socketpair_internal(int af, int type, int protocol, SOCKET *sv);
0
-
0
 rb_pid_t
0
-rb_w32_pipe_exec(const char *cmd, const char *prog, int mode, int *pipe, int *write_pipe)
0
+rb_w32_pipe_exec(const char *cmd, const char *prog, int mode, int *pipe,
0
+		 int *write_pipe)
0
 {
0
     struct ChildRecord* child;
0
     HANDLE hIn, hOut;
0
@@ -762,7 +761,6 @@ rb_w32_pipe_exec(const char *cmd, const char *prog, int mode, int *pipe, int *wr
0
     HANDLE hCurProc;
0
     SECURITY_ATTRIBUTES sa;
0
     BOOL reading, writing;
0
-    int binmode;
0
     int ret;
0
 
0
     /* Figure out what we're doing... */
0
@@ -777,7 +775,9 @@ rb_w32_pipe_exec(const char *cmd, const char *prog, int mode, int *pipe, int *wr
0
   reading = TRUE;
0
   writing = FALSE;
0
     }
0
-    binmode |= (mode & O_BINARY) ? O_BINARY : O_TEXT;
0
+    mode &= ~(O_RDWR|O_RDONLY|O_WRONLY);
0
+    if (!(mode & O_BINARY))
0
+	mode |= O_TEXT;
0
 
0
     sa.nLength              = sizeof (SECURITY_ATTRIBUTES);
0
     sa.lpSecurityDescriptor = NULL;
0
@@ -837,21 +837,31 @@ rb_w32_pipe_exec(const char *cmd, const char *prog, int mode, int *pipe, int *wr
0
 
0
   /* associate handle to file descritor */
0
   if (reading) {
0
-	    *pipe = rb_w32_open_osfhandle((intptr_t)hDupIn, _O_RDONLY | binmode);
0
+	    *pipe = rb_w32_open_osfhandle((intptr_t)hDupIn, O_RDONLY | mode);
0
       if (writing)
0
-		*write_pipe = rb_w32_open_osfhandle((intptr_t)hDupOut, _O_WRONLY | binmode);
0
+		*write_pipe = rb_w32_open_osfhandle((intptr_t)hDupOut,
0
+						    O_WRONLY | mode);
0
   }
0
   else {
0
-	    *pipe = rb_w32_open_osfhandle((intptr_t)hDupOut, _O_WRONLY | binmode);
0
+	    *pipe = rb_w32_open_osfhandle((intptr_t)hDupOut, O_WRONLY | mode);
0
   }
0
   if (hIn)
0
       CloseHandle(hIn);
0
   if (hOut)
0
       CloseHandle(hOut);
0
-	if (*pipe == -1) {
0
-	    if (hDupIn)
0
+	if (reading && writing && *write_pipe == -1) {
0
+	    if (*pipe != -1)
0
+		rb_w32_close(*pipe);
0
+	    else
0
     CloseHandle(hDupIn);
0
-	    if (hDupOut)
0
+	    CloseHandle(hDupOut);
0
+	    CloseChildHandle(child);
0
+	    break;
0
+	}
0
+	else if (*pipe == -1) {
0
+	    if (reading)
0
+		CloseHandle(hDupIn);
0
+	    else
0
     CloseHandle(hDupOut);
0
       CloseChildHandle(child);
0
       break;
0
@@ -2272,8 +2282,11 @@ rb_w32_accept(int s, struct sockaddr *addr, int *addrlen)
0
       s = -1;
0
   }
0
   else {
0
-	    st_insert(socklist, (st_data_t)r, (st_data_t)0);
0
       s = rb_w32_open_osfhandle(r, O_RDWR|O_BINARY|O_NOINHERIT);
0
+	    if (s != -1)
0
+		st_insert(socklist, (st_data_t)r, (st_data_t)0);
0
+	    else
0
+		closesocket(r);
0
   }
0
     });
0
     return s;
0
@@ -2629,8 +2642,11 @@ rb_w32_socket(int af, int type, int protocol)
0
       fd = -1;
0
   }
0
   else {
0
-	    st_insert(socklist, (st_data_t)s, (st_data_t)0);
0
       fd = rb_w32_open_osfhandle(s, O_RDWR|O_BINARY|O_NOINHERIT);
0
+	    if (fd != -1)
0
+		st_insert(socklist, (st_data_t)s, (st_data_t)0);
0
+	    else
0
+		closesocket(s);
0
   }
0
     });
0
     return fd;
0
@@ -2850,10 +2866,20 @@ rb_w32_socketpair(int af, int type, int protocol, int *sv)
0
 
0
     if (socketpair_internal(af, type, protocol, pair) < 0)
0
   return -1;
0
-    st_insert(socklist, (st_data_t)pair[0], (st_data_t)0);
0
-    st_insert(socklist, (st_data_t)pair[1], (st_data_t)0);
0
     sv[0] = rb_w32_open_osfhandle(pair[0], O_RDWR|O_BINARY|O_NOINHERIT);
0
+    if (sv[0] == -1) {
0
+	closesocket(pair[0]);
0
+	closesocket(pair[1]);
0
+	return -1;
0
+    }
0
     sv[1] = rb_w32_open_osfhandle(pair[1], O_RDWR|O_BINARY|O_NOINHERIT);
0
+    if (sv[1] == -1) {
0
+	rb_w32_close(sv[0]);
0
+	closesocket(pair[1]);
0
+	return -1;
0
+    }
0
+    st_insert(socklist, (st_data_t)pair[0], (st_data_t)0);
0
+    st_insert(socklist, (st_data_t)pair[1], (st_data_t)0);
0
 
0
     return 0;
0
 }