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

[Antony Dovgal]

tony2001                Sun Jul 30 11:56:07 2006 UTC

  Modified files:              (Branch: PHP_4_4)
    /php-src/ext/sockets        sockets.c 
  Log:
  MFH: improve checks and fix #38251
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/sockets.c?r1=1.125.2.29.2.3&r2=1.125.2.29.2.4&diff_format=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.125.2.29.2.3 
php-src/ext/sockets/sockets.c:1.125.2.29.2.4
--- php-src/ext/sockets/sockets.c:1.125.2.29.2.3        Sun Jan  1 13:46:56 2006
+++ php-src/ext/sockets/sockets.c       Sun Jul 30 11:56:07 2006
@@ -19,7 +19,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: sockets.c,v 1.125.2.29.2.3 2006/01/01 13:46:56 sniper Exp $ */
+/* $Id: sockets.c,v 1.125.2.29.2.4 2006/07/30 11:56:07 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -515,6 +515,7 @@
 int php_sock_array_to_fd_set(zval *sock_array, fd_set *fds, SOCKET *max_fd 
TSRMLS_DC) {
        zval            **element;
        php_socket      *php_sock;
+       int                     num = 0;
        
        if (Z_TYPE_P(sock_array) != IS_ARRAY) return 0;
 
@@ -529,9 +530,10 @@
                if (php_sock->bsd_socket > *max_fd) {
                        *max_fd = php_sock->bsd_socket;
                }
+               num++;
        }
 
-       return 1;
+       return num ? 1 : 0;
 }
 
 int php_sock_array_from_fd_set(zval *sock_array, fd_set *fds TSRMLS_DC) {
@@ -539,6 +541,8 @@
        zval            **dest_element;
        php_socket      *php_sock;
        HashTable       *new_hash;
+       int                     num = 0;
+
        if (Z_TYPE_P(sock_array) != IS_ARRAY) return 0;
 
        ALLOC_HASHTABLE(new_hash);
@@ -555,6 +559,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 */
@@ -564,7 +569,7 @@
        zend_hash_internal_pointer_reset(new_hash);
        Z_ARRVAL_P(sock_array) = new_hash;
 
-       return 1;
+       return num ? 1 : 0;
 }
 
 

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