archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

ext/zip: Cancel operation if user callback throws an exception

Browse source
This commit is contained in:
Gina Peter Banyard 2025-01-10 13:08:51 +00:00
parent 79b9fe334a
commit dccd4af9aa
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ext/zip/php_zip.c
View file

@ -3070,10 +3070,12 @@ static int php_zip_cancel_callback(zip_t *arch, void *ptr)
ze_zip_object *obj = ptr; ze_zip_object *obj = ptr;
zend_call_known_fcc(&obj->cancel_callback, &cb_retval, 0, NULL, NULL); zend_call_known_fcc(&obj->cancel_callback, &cb_retval, 0, NULL, NULL);
if (!Z_ISUNDEF(cb_retval)) { if (Z_ISUNDEF(cb_retval)) {
retval = zval_get_long(&cb_retval); /* Cancel if an exception has been thrown */
zval_ptr_dtor(&cb_retval); return -1;
} }
retval = zval_get_long(&cb_retval);
zval_ptr_dtor(&cb_retval);
return retval; return retval;
} }

6
ext/zip/tests/oo_cancel_trampoline.phpt
View file

@ -91,7 +91,9 @@ ValueError: Invalid or uninitialized Zip object
bool(true) bool(true)
bool(true) bool(true)
Trampoline for trampolineThrow Trampoline for trampolineThrow
Warning: ZipArchive::close(): Operation cancelled in %s on line %d
Exception: boo Exception: boo
bool(false) bool(true)
string(8) "No error" string(19) "Operation cancelled"
Done Done