php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.4' into PHP-8.5

Browse Source 
* PHP-8.4:
  phar: Fix memory leak of argument in webPhar
This commit is contained in:
Niels Dossche
2025-10-12 11:15:54 +02:00
parent 1cb539d843 3b878506e1
commit 47bec0cf7f
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ext/phar/phar_object.c
View File

@@ -697,12 +697,15 @@ PHP_METHOD(Phar, webPhar)
rewrite_fci.retval = &retval;
if (FAILURE == zend_call_function(&rewrite_fci, &rewrite_fcc)) {
zval_ptr_dtor_str(&params);
if (!EG(exception)) {
zend_throw_exception_ex(phar_ce_PharException, 0, "phar error: failed to call rewrite callback");
}
goto cleanup_fail;
}
zval_ptr_dtor_str(&params);
if (Z_TYPE_P(rewrite_fci.retval) == IS_UNDEF || Z_TYPE(retval) == IS_UNDEF) {
zend_throw_exception_ex(phar_ce_PharException, 0, "phar error: rewrite callback must return a string or false");
goto cleanup_fail;
@@ -728,7 +731,6 @@ PHP_METHOD(Phar, webPhar)
zend_throw_exception_ex(phar_ce_PharException, 0, "phar error: rewrite callback must return a string or false");
cleanup_fail:
zval_ptr_dtor(&params);
if (free_pathinfo) {
efree(path_info);
}