ext/zip: Preinitialize arrays when size is known (php#21572)

LamentXU123 · web-flow · commit 7d5847d4d3fe · 2026-04-06T13:52:20.000+01:00
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
@@ -709,7 +709,7 @@ int php_zip_glob(zend_string *spattern, zend_long flags, zval *return_value) /*
 		return -1;
 	}
 
-	array_init(return_value);
+	array_init_size(return_value, (uint32_t)globbuf.gl_pathc);
 	for (size_t n = 0; n < globbuf.gl_pathc; n++) {
 		/* we need to do this every time since PHP_GLOB_ONLYDIR does not guarantee that
 		 * all directories will be filtered. GNU libc documentation states the
@@ -788,7 +788,7 @@ int php_zip_pcre(zend_string *regexp, char *path, int path_len, zval *return_val
 			return -1;
 		}
 
-		array_init(return_value);
+		array_init_size(return_value, (uint32_t)files_cnt);
 
 		/* only the files, directories are ignored */
 		for (i = 0; i < files_cnt; i++) {

Original file line number	Diff line number	Diff line change
`@@ -709,7 +709,7 @@ int php_zip_glob(zend_string spattern, zend_long flags, zval return_value) /*`
`709`	`709`	`return -1;`
`710`	`710`	`}`
`711`	`711`
`712`		`- array_init(return_value);`
	`712`	`+ array_init_size(return_value, (uint32_t)globbuf.gl_pathc);`
`713`	`713`	`for (size_t n = 0; n < globbuf.gl_pathc; n++) {`
`714`	`714`	`/* we need to do this every time since PHP_GLOB_ONLYDIR does not guarantee that`
`715`	`715`	`* all directories will be filtered. GNU libc documentation states the`
`@@ -788,7 +788,7 @@ int php_zip_pcre(zend_string regexp, char path, int path_len, zval *return_val`
`788`	`788`	`return -1;`
`789`	`789`	`}`
`790`	`790`
`791`		`- array_init(return_value);`
	`791`	`+ array_init_size(return_value, (uint32_t)files_cnt);`
`792`	`792`
`793`	`793`	`/* only the files, directories are ignored */`
`794`	`794`	`for (i = 0; i < files_cnt; i++) {`