diff --git a/NEWS b/NEWS index a1e87ca9c50..f322a7e0876 100644 --- a/NEWS +++ b/NEWS @@ -28,7 +28,8 @@ PHP NEWS - Phar: . Fix memory leak of argument in webPhar. (nielsdos) . Fix memory leak when setAlias() fails. (nielsdos) - . Fix memory leak in phar_parse_zipfile() error handling. (nielsdos) + . Fix a bunch of memory leaks in phar_parse_zipfile() error handling. + (nielsdos) . Fix file descriptor/memory leak when opening central fp fails. (nielsdos) - Random: diff --git a/ext/phar/zip.c b/ext/phar/zip.c index c188d6513ab..f1d0edd5bdf 100644 --- a/ext/phar/zip.c +++ b/ext/phar/zip.c @@ -314,6 +314,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); \ @@ -619,7 +620,6 @@ foundit: } if (!entry.uncompressed_filesize) { - efree(actual_alias); php_stream_filter_remove(filter, 1); pefree(entry.filename, entry.is_persistent); PHAR_ZIP_FAIL("unable to read in alias, truncated"); @@ -653,7 +653,6 @@ foundit: } if (!entry.uncompressed_filesize) { - efree(actual_alias); php_stream_filter_remove(filter, 1); pefree(entry.filename, entry.is_persistent); PHAR_ZIP_FAIL("unable to read in alias, truncated"); @@ -677,7 +676,6 @@ foundit: } if (!entry.uncompressed_filesize) { - efree(actual_alias); pefree(entry.filename, entry.is_persistent); PHAR_ZIP_FAIL("unable to read in alias, truncated"); }