From 609ddf2cec6282216a6b8d91482f8c25d24b37e4 Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Sun, 30 Jul 2006 11:56:07 +0000 Subject: [PATCH] MFH: improve checks and fix #38251 --- ext/sockets/sockets.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c index 831fa8952a..561dc775e0 100644 --- 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,8 @@ 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; ALLOC_HASHTABLE(new_hash); @@ -555,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 */ @@ -564,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; } -- 2.40.0