[PHP-CVS] cvs: php-src(PHP_4_3) /main network.c

[Wez Furlong]

wez             Fri Jul  2 13:23:07 2004 EDT

  Modified files:              (Branch: PHP_4_3)
    /php-src/main       network.c 
  Log:
  Fix #28996: unix sockets leak when connection fails
  
  
http://cvs.php.net/diff.php/php-src/main/network.c?r1=1.83.2.25&r2=1.83.2.26&ty=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.83.2.25 php-src/main/network.c:1.83.2.26
--- php-src/main/network.c:1.83.2.25    Sun May 23 06:43:15 2004
+++ php-src/main/network.c      Fri Jul  2 13:23:07 2004
@@ -16,7 +16,7 @@
    | Streams work by Wez Furlong <[EMAIL PROTECTED]>                   |
    +----------------------------------------------------------------------+
  */
-/* $Id: network.c,v 1.83.2.25 2004/05/23 10:43:15 wez Exp $ */
+/* $Id: network.c,v 1.83.2.26 2004/07/02 17:23:07 wez Exp $ */
 
 /*#define DEBUG_MAIN_NETWORK 1*/
 
@@ -704,8 +704,11 @@
        
        memcpy(unix_addr.sun_path, path, pathlen);
 
-       if (php_connect_nonb(socketd, (struct sockaddr *) &unix_addr, 
sizeof(unix_addr), timeout) == SOCK_CONN_ERR) 
+       if (php_connect_nonb(socketd, (struct sockaddr *) &unix_addr,
+                       sizeof(unix_addr), timeout) == SOCK_CONN_ERR) {
+               closesocket(socketd);
                return NULL;
+       }
 
        stream = php_stream_sock_open_from_socket_rel(socketd, persistent_id);
        if (stream == NULL)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php