Merge branch 'PHP-8.4' into PHP-8.5

ndossche · ndossche · commit d05f88e228cd · 2025-10-21T19:36:42.000+02:00
* PHP-8.4:
  phar: Fix file descriptor leak in phar_zip_flush() on failure.
diff --git a/ext/phar/zip.c b/ext/phar/zip.c
@@ -1278,6 +1278,7 @@ void phar_zip_flush(phar_archive_data *phar, zend_string *user_stub, bool is_def
 			return;
 		}
 		if (phar->alias_len != php_stream_write(entry.fp, phar->alias, phar->alias_len)) {
+			php_stream_close(entry.fp);
 			if (error) {
 				spprintf(error, 0, "unable to set alias in zip-based phar \"%s\"", phar->fname);
 			}

Original file line number	Diff line number	Diff line change
`@@ -1278,6 +1278,7 @@ void phar_zip_flush(phar_archive_data phar, zend_string user_stub, bool is_def`
`1278`	`1278`	`return;`
`1279`	`1279`	`}`
`1280`	`1280`	`if (phar->alias_len != php_stream_write(entry.fp, phar->alias, phar->alias_len)) {`
	`1281`	`+ php_stream_close(entry.fp);`
`1281`	`1282`	`if (error) {`
`1282`	`1283`	`spprintf(error, 0, "unable to set alias in zip-based phar \"%s\"", phar->fname);`
`1283`	`1284`	`}`