Merge branch 'PHP-8.5'

devnexen · devnexen · commit bac62bf31aa2 · 2025-10-25T21:51:38.000+01:00
* PHP-8.5:
  ext/zip: ZipArchive callback missing zend_release_fcall_info_cache
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
@@ -3045,6 +3045,7 @@ PHP_METHOD(ZipArchive, registerProgressCallback)
 
 	/* register */
 	if (zip_register_progress_callback_with_state(intern, rate, php_zip_progress_callback, php_zip_progress_callback_free, obj)) {
+		zend_release_fcall_info_cache(&fcc);
 		RETURN_FALSE;
 	}
 	zend_fcc_dup(&obj->progress_callback, &fcc);
@@ -3104,6 +3105,7 @@ PHP_METHOD(ZipArchive, registerCancelCallback)
 
 	/* register */
 	if (zip_register_cancel_callback_with_state(intern, php_zip_cancel_callback, php_zip_cancel_callback_free, obj)) {
+		zend_release_fcall_info_cache(&fcc);
 		RETURN_FALSE;
 	}
 	zend_fcc_dup(&obj->cancel_callback, &fcc);

Original file line number	Diff line number	Diff line change
`@@ -3045,6 +3045,7 @@ PHP_METHOD(ZipArchive, registerProgressCallback)`
`3045`	`3045`
`3046`	`3046`	`/* register */`
`3047`	`3047`	`if (zip_register_progress_callback_with_state(intern, rate, php_zip_progress_callback, php_zip_progress_callback_free, obj)) {`
	`3048`	`+ zend_release_fcall_info_cache(&fcc);`
`3048`	`3049`	`RETURN_FALSE;`
`3049`	`3050`	`}`
`3050`	`3051`	`zend_fcc_dup(&obj->progress_callback, &fcc);`
`@@ -3104,6 +3105,7 @@ PHP_METHOD(ZipArchive, registerCancelCallback)`
`3104`	`3105`
`3105`	`3106`	`/* register */`
`3106`	`3107`	`if (zip_register_cancel_callback_with_state(intern, php_zip_cancel_callback, php_zip_cancel_callback_free, obj)) {`
	`3108`	`+ zend_release_fcall_info_cache(&fcc);`
`3107`	`3109`	`RETURN_FALSE;`
`3108`	`3110`	`}`
`3109`	`3111`	`zend_fcc_dup(&obj->cancel_callback, &fcc);`