php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.3' into PHP-8.4

Browse Source 
* PHP-8.3:
  NEWS for GH-19162
  ext/socket: Remove incorrect zval_ptr_dtor
  ext/hash: Remove incorrect zval_ptr_dtor
This commit is contained in:
Niels Dossche
2025-07-17 21:52:23 +02:00
parent 554ae518a2 86aaded7e5
commit d9602e4362
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
NEWS
View File

@@ -2,6 +2,9 @@ PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? ????, PHP 8.4.12
- Hash:
. Fix crash on clone failure. (nielsdos)
- Intl:
. Fix memleak on failure in collator_get_sort_key(). (nielsdos)
@@ -14,6 +17,9 @@ PHP NEWS
return value check). (nielsdos, botovq)
. Fix error return check of EVP_CIPHER_CTX_ctrl(). (nielsdos)
- Sockets:
. Fix some potential crashes on incorrect argument value. (nielsdos)
31 Jul 2025, PHP 8.4.11
- Calendar:

2
ext/hash/hash.c
View File

@@ -849,8 +849,6 @@ PHP_FUNCTION(hash_copy)
RETVAL_OBJ(Z_OBJ_HANDLER_P(zhash, clone_obj)(Z_OBJ_P(zhash)));
if (php_hashcontext_from_object(Z_OBJ_P(return_value))->context == NULL) {
zval_ptr_dtor(return_value);
zend_throw_error(NULL, "Cannot copy hash");
RETURN_THROWS();
}

2
ext/sockets/sockets.c
View File

@@ -2589,7 +2589,6 @@ PHP_FUNCTION(socket_addrinfo_bind)
}
default:
close(php_sock->bsd_socket);
zval_ptr_dtor(return_value);
zend_argument_value_error(1, "must be one of AF_UNIX, AF_INET, or AF_INET6");
RETURN_THROWS();
}
@@ -2653,7 +2652,6 @@ PHP_FUNCTION(socket_addrinfo_connect)
default:
zend_argument_value_error(1, "socket type must be one of AF_UNIX, AF_INET, or AF_INET6");
close(php_sock->bsd_socket);
zval_ptr_dtor(return_value);
RETURN_THROWS();
}