Merge branch 'PHP-8.4' into PHP-8.5

ndossche · ndossche · commit 32a0d94cc579 · 2025-10-13T09:08:24.000+02:00
* PHP-8.4:
  phar: Fix file descriptor/memory leak when opening central fp fails
diff --git a/ext/phar/zip.c b/ext/phar/zip.c
@@ -1401,6 +1401,7 @@ void phar_zip_flush(phar_archive_data *phar, zend_string *user_stub, bool is_def
 	pass.centralfp = php_stream_fopen_tmpfile();
 
 	if (!pass.centralfp) {
+		php_stream_close(pass.filefp);
 		goto fperror;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1401,6 +1401,7 @@ void phar_zip_flush(phar_archive_data phar, zend_string user_stub, bool is_def`
`1401`	`1401`	`pass.centralfp = php_stream_fopen_tmpfile();`
`1402`	`1402`
`1403`	`1403`	`if (!pass.centralfp) {`
	`1404`	`+ php_stream_close(pass.filefp);`
`1404`	`1405`	`goto fperror;`
`1405`	`1406`	`}`
`1406`	`1407`