Merge branch 'PHP-8.4' into PHP-8.5

ndossche · ndossche · commit 7ad5146bc17c · 2025-10-12T11:29:14.000+02:00
* PHP-8.4:
  Fix memory leak in phar_parse_zipfile() error handling
diff --git a/ext/phar/zip.c b/ext/phar/zip.c
@@ -674,7 +674,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");
@@ -707,7 +708,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");
@@ -730,7 +732,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
`@@ -674,7 +674,8 @@ int phar_parse_zipfile(php_stream fp, char fname, size_t fname_len, char *alia`
`674`	`674`	`}`
`675`	`675`	`}`
`676`	`676`
`677`		`- if (!entry.uncompressed_filesize \|\| !actual_alias) {`
	`677`	`+ if (!entry.uncompressed_filesize) {`
	`678`	`+ efree(actual_alias);`
`678`	`679`	`php_stream_filter_remove(filter, 1);`
`679`	`680`	`zend_string_release_ex(entry.filename, entry.is_persistent);`
`680`	`681`	`PHAR_ZIP_FAIL("unable to read in alias, truncated");`
`@@ -707,7 +708,8 @@ int phar_parse_zipfile(php_stream fp, char fname, size_t fname_len, char *alia`
`707`	`708`	`}`
`708`	`709`	`}`
`709`	`710`
`710`		`- if (!entry.uncompressed_filesize \|\| !actual_alias) {`
	`711`	`+ if (!entry.uncompressed_filesize) {`
	`712`	`+ efree(actual_alias);`
`711`	`713`	`php_stream_filter_remove(filter, 1);`
`712`	`714`	`zend_string_release_ex(entry.filename, entry.is_persistent);`
`713`	`715`	`PHAR_ZIP_FAIL("unable to read in alias, truncated");`
`@@ -730,7 +732,8 @@ int phar_parse_zipfile(php_stream fp, char fname, size_t fname_len, char *alia`
`730`	`732`	`}`
`731`	`733`	`}`
`732`	`734`
`733`		`- if (!entry.uncompressed_filesize \|\| !actual_alias) {`
	`735`	`+ if (!entry.uncompressed_filesize) {`
	`736`	`+ efree(actual_alias);`
`734`	`737`	`zend_string_release_ex(entry.filename, entry.is_persistent);`
`735`	`738`	`PHAR_ZIP_FAIL("unable to read in alias, truncated");`
`736`	`739`	`}`