Merge branch 'PHP-8.5'

ndossche · ndossche · commit 75426c5ba28a · 2025-10-21T19:37:19.000+02:00
* PHP-8.5:
  phar: Fix file descriptor leak in phar_zip_flush() on failure.
diff --git a/ext/phar/zip.c b/ext/phar/zip.c
@@ -1259,6 +1259,7 @@ ZEND_ATTRIBUTE_NONNULL_ARGS(1, 4) void phar_zip_flush(phar_archive_data *phar, z
 			return;
 		}
 		if (phar->alias_len != php_stream_write(entry.fp, phar->alias, phar->alias_len)) {
+			php_stream_close(entry.fp);
 			spprintf(error, 0, "unable to set alias in zip-based phar \"%s\"", phar->fname);
 			return;
 		}

Original file line number	Diff line number	Diff line change
`@@ -1259,6 +1259,7 @@ ZEND_ATTRIBUTE_NONNULL_ARGS(1, 4) void phar_zip_flush(phar_archive_data *phar, z`
`1259`	`1259`	`return;`
`1260`	`1260`	`}`
`1261`	`1261`	`if (phar->alias_len != php_stream_write(entry.fp, phar->alias, phar->alias_len)) {`
	`1262`	`+ php_stream_close(entry.fp);`
`1262`	`1263`	`spprintf(error, 0, "unable to set alias in zip-based phar \"%s\"", phar->fname);`
`1263`	`1264`	`return;`
`1264`	`1265`	`}`