Merge branch 'PHP-8.5'

ndossche · ndossche · commit fbb09bb6501e · 2025-10-12T11:29:23.000+02:00
* PHP-8.5:
  Fix memory leak in phar_parse_zipfile() error handling
diff --git a/ext/phar/zip.c b/ext/phar/zip.c
@@ -667,7 +667,8 @@ int phar_parse_zipfile(php_stream *fp, char *fname, size_t fname_len, char *alia
 					}
 				}
 
-				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");
@@ -700,7 +701,8 @@ int phar_parse_zipfile(php_stream *fp, char *fname, size_t fname_len, char *alia
 					}
 				}
 
-				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");
@@ -723,7 +725,8 @@ int phar_parse_zipfile(php_stream *fp, char *fname, size_t fname_len, char *alia
 					}
 				}
 
-				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");
 				}

Original file line number	Diff line number	Diff line change
`@@ -667,7 +667,8 @@ int phar_parse_zipfile(php_stream fp, char fname, size_t fname_len, char *alia`
`667`	`667`	`}`
`668`	`668`	`}`
`669`	`669`
`670`		`- if (!entry.uncompressed_filesize \|\| !actual_alias) {`
	`670`	`+ if (!entry.uncompressed_filesize) {`
	`671`	`+ efree(actual_alias);`
`671`	`672`	`php_stream_filter_remove(filter, 1);`
`672`	`673`	`zend_string_release_ex(entry.filename, entry.is_persistent);`
`673`	`674`	`PHAR_ZIP_FAIL("unable to read in alias, truncated");`
`@@ -700,7 +701,8 @@ int phar_parse_zipfile(php_stream fp, char fname, size_t fname_len, char *alia`
`700`	`701`	`}`
`701`	`702`	`}`
`702`	`703`
`703`		`- if (!entry.uncompressed_filesize \|\| !actual_alias) {`
	`704`	`+ if (!entry.uncompressed_filesize) {`
	`705`	`+ efree(actual_alias);`
`704`	`706`	`php_stream_filter_remove(filter, 1);`
`705`	`707`	`zend_string_release_ex(entry.filename, entry.is_persistent);`
`706`	`708`	`PHAR_ZIP_FAIL("unable to read in alias, truncated");`
`@@ -723,7 +725,8 @@ int phar_parse_zipfile(php_stream fp, char fname, size_t fname_len, char *alia`
`723`	`725`	`}`
`724`	`726`	`}`
`725`	`727`
`726`		`- if (!entry.uncompressed_filesize \|\| !actual_alias) {`
	`728`	`+ if (!entry.uncompressed_filesize) {`
	`729`	`+ efree(actual_alias);`
`727`	`730`	`zend_string_release_ex(entry.filename, entry.is_persistent);`
`728`	`731`	`PHAR_ZIP_FAIL("unable to read in alias, truncated");`
`729`	`732`	`}`