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

Merge branch 'PHP-8.4'

Browse source 
* PHP-8.4:
  Fix GH-18431: Registering ZIP progress callback twice doesn't work
This commit is contained in:
Niels Dossche 2025-04-26 14:27:15 +02:00
commit a7cc447b28
No known key found for this signature in database
GPG key ID: B8A8AD166DF0E2E5
2 changed files with 24 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ext/zip/php_zip.c
View file

@ -3050,14 +3050,11 @@ PHP_METHOD(ZipArchive, registerProgressCallback)
RETURN_THROWS();
}
/* free if called twice */
php_zip_progress_callback_free(obj);
/* register */
zend_fcc_dup(&obj->progress_callback, &fcc);
if (zip_register_progress_callback_with_state(intern, rate, php_zip_progress_callback, php_zip_progress_callback_free, obj)) {
RETURN_FALSE;
}
zend_fcc_dup(&obj->progress_callback, &fcc);
RETURN_TRUE;
}
@ -3108,14 +3105,11 @@ PHP_METHOD(ZipArchive, registerCancelCallback)
RETURN_THROWS();
}
/* free if called twice */
php_zip_cancel_callback_free(obj);
/* register */
zend_fcc_dup(&obj->cancel_callback, &fcc);
if (zip_register_cancel_callback_with_state(intern, php_zip_cancel_callback, php_zip_cancel_callback_free, obj)) {
RETURN_FALSE;
}
zend_fcc_dup(&obj->cancel_callback, &fcc);
RETURN_TRUE;
}