Skip to content

zip: skip the entry name allocation when there is no add_path #22975

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
iliaal wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −10
Open

zip: skip the entry name allocation when there is no add_path #22975

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
23 changes: 13 additions & 10 deletions ext/zip/php_zip.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ static bool php_zip_extract_file(struct zip * za, char *dest, const char *file,
/* }}} */

static zend_result php_zip_add_file(ze_zip_object *obj, const char *filename, size_t filename_len,
char *entry_name, size_t entry_name_len, /* unused if replace >= 0 */
const char *entry_name, size_t entry_name_len, /* unused if replace >= 0 */
zip_uint64_t offset_start, zip_uint64_t offset_len,
zend_long replace, /* index to replace, add new file if < 0 */
zip_flags_t flags
Expand Down Expand Up @@ -1845,7 +1845,9 @@ static void php_zip_add_from_pattern(INTERNAL_FUNCTION_PARAMETERS, int type) /*
file_stripped_len = Z_STRLEN_P(zval_file);
}

zend_string *entry_name;
zend_string *entry_name = NULL;
const char *entry_name_str = file_stripped;
size_t entry_name_len = file_stripped_len;
if (opts.add_path) {
if ((ZSTR_LEN(opts.add_path) + file_stripped_len) > MAXPATHLEN) {
if (basename) {
Expand All @@ -1860,20 +1862,21 @@ static void php_zip_add_from_pattern(INTERNAL_FUNCTION_PARAMETERS, int type) /*
ZSTR_VAL(opts.add_path), ZSTR_LEN(opts.add_path),
file_stripped, file_stripped_len
);
} else {
entry_name = zend_string_init(file_stripped, file_stripped_len, false);
entry_name_str = ZSTR_VAL(entry_name);
entry_name_len = ZSTR_LEN(entry_name);
}
ZEND_ASSERT(ZSTR_LEN(entry_name) <= MAXPATHLEN);
ZEND_ASSERT(entry_name_len <= MAXPATHLEN);

const zend_result status = php_zip_add_file(ze_obj, Z_STRVAL_P(zval_file), Z_STRLEN_P(zval_file),
entry_name_str, entry_name_len, 0, 0, -1, opts.flags);

if (basename) {
zend_string_release_ex(basename, false);
basename = NULL;
}

const zend_result status = php_zip_add_file(ze_obj, Z_STRVAL_P(zval_file), Z_STRLEN_P(zval_file),
ZSTR_VAL(entry_name), ZSTR_LEN(entry_name), 0, 0, -1, opts.flags);

zend_string_release_ex(entry_name, false);
if (entry_name) {
zend_string_release_ex(entry_name, false);
}
if (status == FAILURE) {
zend_array_destroy(Z_ARR_P(return_value));
RETURN_FALSE;
Expand Down
Loading