Merge branch 'PHP-8.4'

ndossche · ndossche · commit 8cd085a179f7 · 2025-09-05T18:57:31.000+02:00
* PHP-8.4:
  Fix memory leak in zip when encountering empty glob result
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
@@ -628,7 +628,6 @@ int php_zip_glob(char *pattern, int pattern_len, zend_long flags, zval *return_v
 			   can be used for simple glob() calls without further error
 			   checking.
 			*/
-			array_init(return_value);
 			return 0;
 		}
 #endif
@@ -637,7 +636,6 @@ int php_zip_glob(char *pattern, int pattern_len, zend_long flags, zval *return_v
 
 	/* now catch the FreeBSD style of "no matches" */
 	if (!globbuf.gl_pathc || !globbuf.gl_pathv) {
-		array_init(return_value);
 		return 0;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -628,7 +628,6 @@ int php_zip_glob(char pattern, int pattern_len, zend_long flags, zval return_v`
`628`	`628`	`can be used for simple glob() calls without further error`
`629`	`629`	`checking.`
`630`	`630`	`*/`
`631`		`- array_init(return_value);`
`632`	`631`	`return 0;`
`633`	`632`	`}`
`634`	`633`	`#endif`
`@@ -637,7 +636,6 @@ int php_zip_glob(char pattern, int pattern_len, zend_long flags, zval return_v`
`637`	`636`
`638`	`637`	`/* now catch the FreeBSD style of "no matches" */`
`639`	`638`	`if (!globbuf.gl_pathc \|\| !globbuf.gl_pathv) {`
`640`		`- array_init(return_value);`
`641`	`639`	`return 0;`
`642`	`640`	`}`
`643`	`641`