Backport fix from PHP 8.3: The exception handler already takes care of destroying the return value

derickr · derickr · commit fecad54d74bb · 2024-09-13T11:04:45.000+01:00
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
@@ -3822,7 +3822,6 @@ PHP_METHOD(DateTimeZone, __set_state)
 	tzobj = Z_PHPTIMEZONE_P(return_value);
 	if (!php_date_timezone_initialize_from_hash(&return_value, &tzobj, myht)) {
 		zend_throw_error(NULL, "Timezone initialization failed");
-		zval_ptr_dtor(return_value);
 		RETURN_THROWS();
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -3822,7 +3822,6 @@ PHP_METHOD(DateTimeZone, __set_state)`
`3822`	`3822`	`tzobj = Z_PHPTIMEZONE_P(return_value);`
`3823`	`3823`	`if (!php_date_timezone_initialize_from_hash(&return_value, &tzobj, myht)) {`
`3824`	`3824`	`zend_throw_error(NULL, "Timezone initialization failed");`
`3825`		`- zval_ptr_dtor(return_value);`
`3826`	`3825`	`RETURN_THROWS();`
`3827`	`3826`	`}`
`3828`	`3827`	`}`