Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LamentXU123 wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −2
Open

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ext/zip/php_zip.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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++) {
Expand Down
Loading