re-apply fix for #38251 (socket_select() and invalid arguments)

diff --git a/NEWS b/NEWS
index a666d3e55ee4b9620ae5110567acbcb2b76601a4..1d08e7207575667d86ecda04360604bd1e3e81a4 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ PHP 4                                                                      NEWS
 ?? ??? 2006, Version 4.4.4
 - Fixed bug #38278 (session_cache_expire()'s value does not match phpinfo's 
   session.cache_expire). (Tony)
+- Fixed bug #38251 (socket_select() and invalid arguments). (Tony)
 - Fixed bug #38183 (disable_classes=Foobar causes disabled class to be
   called Foo). (Jani)
 - Fixed bug #38112 (corrupted gif segfaults) (Pierre)

diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index 0fd2387294d6791c99a0cc745aba4410f4c26299..561dc775e0034bd71d5ab2dea590db2efecf76d5 100644 (file)
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -515,6 +515,7 @@ PHP_RSHUTDOWN_FUNCTION(sockets)
 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 @@ int php_sock_array_to_fd_set(zval *sock_array, fd_set *fds, SOCKET *max_fd TSRML
                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,7 @@ int php_sock_array_from_fd_set(zval *sock_array, fd_set *fds TSRMLS_DC) {
        zval            **dest_element;
        php_socket      *php_sock;
        HashTable       *new_hash;
+       int                     num = 0;
 
        if (Z_TYPE_P(sock_array) != IS_ARRAY) return 0;
 
@@ -556,6 +559,7 @@ int php_sock_array_from_fd_set(zval *sock_array, fd_set *fds TSRMLS_DC) {
                        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 */
@@ -565,7 +569,7 @@ int php_sock_array_from_fd_set(zval *sock_array, fd_set *fds TSRMLS_DC) {
        zend_hash_internal_pointer_reset(new_hash);
        Z_ARRVAL_P(sock_array) = new_hash;
 
-       return 1;
+       return num ? 1 : 0;
 }