[PHP-CVS] cvs: php-src(PHP_5_2) /ext/sockets sockets.c

[Antony Dovgal]

tony2001                Sun Jul 30 11:54:18 2006 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/sockets        sockets.c 
  Log:
  improve checks and fix #38251
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/sockets.c?r1=1.171.2.9.2.1&r2=1.171.2.9.2.2&diff_format=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.171.2.9.2.1 
php-src/ext/sockets/sockets.c:1.171.2.9.2.2
--- php-src/ext/sockets/sockets.c:1.171.2.9.2.1 Thu Jun 15 18:33:08 2006
+++ php-src/ext/sockets/sockets.c       Sun Jul 30 11:54:17 2006
@@ -19,7 +19,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: sockets.c,v 1.171.2.9.2.1 2006/06/15 18:33:08 dmitry Exp $ */
+/* $Id: sockets.c,v 1.171.2.9.2.2 2006/07/30 11:54:17 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -536,6 +536,7 @@
 {
        zval            **element;
        php_socket      *php_sock;
+       int                     num = 0;
        
        if (Z_TYPE_P(sock_array) != IS_ARRAY) return 0;
 
@@ -550,9 +551,10 @@
                if (php_sock->bsd_socket > *max_fd) {
                        *max_fd = php_sock->bsd_socket;
                }
+               num++;
        }
 
-       return 1;
+       return num ? 1 : 0;
 }
 
 static int php_sock_array_from_fd_set(zval *sock_array, fd_set *fds TSRMLS_DC)
@@ -561,6 +563,7 @@
        zval            **dest_element;
        php_socket      *php_sock;
        HashTable       *new_hash;
+       int                     num = 0;
 
        if (Z_TYPE_P(sock_array) != IS_ARRAY) return 0;
 
@@ -578,6 +581,7 @@
                        zend_hash_next_index_insert(new_hash, (void *)element, 
sizeof(zval *), (void **)&dest_element);
                        if (dest_element) zval_add_ref(dest_element);
                }
+               num++;
        }
 
        /* Destroy old array, add new one */
@@ -587,7 +591,7 @@
        zend_hash_internal_pointer_reset(new_hash);
        Z_ARRVAL_P(sock_array) = new_hash;
 
-       return 1;
+       return num ? 1 : 0;
 }
 
 /* {{{ proto int socket_select(array &read_fds, array &write_fds, &array 
except_fds, int tv_sec[, int tv_usec])

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