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:
  Fix memory leak in phar_parse_zipfile() error handling
This commit is contained in:
Niels Dossche
2025-10-12 11:29:14 +02:00
parent 0b231c4895 29bfb43f59
commit 7ad5146bc1
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ext/phar/zip.c
View File

@@ -674,7 +674,8 @@ foundit:
}
}
if (!entry.uncompressed_filesize || !actual_alias) {
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");
@@ -707,7 +708,8 @@ foundit:
}
}
if (!entry.uncompressed_filesize || !actual_alias) {
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");
@@ -730,7 +732,8 @@ foundit:
}
}
if (!entry.uncompressed_filesize || !actual_alias) {
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");
}