Merge branch 'PHP-8.4'

ndossche · ndossche · commit 04eadc803d56 · 2025-07-17T21:53:39.000+02:00
* PHP-8.4: NEWS for phpGH-19162 ext/socket: Remove incorrect zval_ptr_dtor ext/hash: Remove incorrect zval_ptr_dtor
diff --git a/ext/hash/hash.c b/ext/hash/hash.c
@@ -851,8 +851,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();
 	}

Original file line number	Diff line number	Diff line change
`@@ -851,8 +851,6 @@ PHP_FUNCTION(hash_copy)`
`851`	`851`	`RETVAL_OBJ(Z_OBJ_HANDLER_P(zhash, clone_obj)(Z_OBJ_P(zhash)));`
`852`	`852`
`853`	`853`	`if (php_hashcontext_from_object(Z_OBJ_P(return_value))->context == NULL) {`
`854`		`- zval_ptr_dtor(return_value);`
`855`		`-`
`856`	`854`	`zend_throw_error(NULL, "Cannot copy hash");`
`857`	`855`	`RETURN_THROWS();`
`858`	`856`	`}`