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 more alias memory leaks
This commit is contained in:
Niels Dossche
2025-10-13 18:51:32 +02:00
parent 599078f70b 5e5883344a
commit 5ce00197f4
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ext/phar/zip.c
View File

@@ -346,6 +346,7 @@ foundit:
entry.fp_type = PHAR_FP;
entry.is_persistent = mydata->is_persistent;
#define PHAR_ZIP_FAIL(errmsg) \
efree(actual_alias); \
zend_hash_destroy(&mydata->manifest); \
HT_INVALIDATE(&mydata->manifest); \
zend_hash_destroy(&mydata->mounted_dirs); \
@@ -652,7 +653,6 @@ foundit:
}
if (!entry.uncompressed_filesize) {
efree(actual_alias);
php_stream_filter_remove(filter, 1);
zend_string_release_ex(entry.filename, entry.is_persistent);
PHAR_ZIP_FAIL("unable to read in alias, truncated");
@@ -686,7 +686,6 @@ foundit:
}
if (!entry.uncompressed_filesize) {
efree(actual_alias);
php_stream_filter_remove(filter, 1);
zend_string_release_ex(entry.filename, entry.is_persistent);
PHAR_ZIP_FAIL("unable to read in alias, truncated");
@@ -710,7 +709,6 @@ foundit:
}
if (!entry.uncompressed_filesize) {
efree(actual_alias);
zend_string_release_ex(entry.filename, entry.is_persistent);
PHAR_ZIP_FAIL("unable to read in alias, truncated");
}