Skip to content

ext/phar: avoid redundant allocation by using zend_string for alias #21783

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

Closed
arshidkv12 wants to merge 2 commits into from
+23 −54
Closed

ext/phar: avoid redundant allocation by using zend_string for alias #21783

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c54810
ext/phar: avoid redundant allocation by using zend_string for alias
arshidkv12 Apr 17, 2026
5acfa1d
Merge branch 'master' into phar-3
arshidkv12 Apr 17, 2026
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
77 changes: 23 additions & 54 deletions ext/phar/zip.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,9 +232,9 @@ zend_result phar_parse_zipfile(php_stream *fp, const char *fname, size_t fname_l
uint16_t i;
phar_archive_data *mydata = NULL;
phar_entry_info entry = {0};
char *ext, *actual_alias = NULL;
char *ext = NULL;
char *metadata = NULL;

zend_string *actual_alias = NULL;
size = php_stream_tell(fp);

if (size > sizeof(locator) + 65536) {
Expand Down Expand Up @@ -341,7 +341,10 @@ zend_result phar_parse_zipfile(php_stream *fp, const char *fname, size_t fname_l
entry.fp_type = PHAR_FP;
entry.is_persistent = mydata->is_persistent;
#define PHAR_ZIP_FAIL(errmsg) \
efree(actual_alias); \
if (actual_alias) { \
zend_string_release_ex(actual_alias, 0); \
actual_alias = NULL; \
} \
zend_hash_destroy(&mydata->manifest); \
HT_INVALIDATE(&mydata->manifest); \
zend_hash_destroy(&mydata->mounted_dirs); \
Expand Down Expand Up @@ -600,7 +603,7 @@ zend_result phar_parse_zipfile(php_stream *fp, const char *fname, size_t fname_l
ZVAL_UNDEF(&entry.metadata_tracker.val);
}

if (!actual_alias && zend_string_equals_literal(entry.filename, ".phar/alias.txt")) {
if (actual_alias == NULL && zend_string_equals_literal(entry.filename, ".phar/alias.txt")) {
php_stream_filter *filter;

/* archive alias found */
Expand All @@ -626,19 +629,7 @@ zend_result phar_parse_zipfile(php_stream *fp, const char *fname, size_t fname_l

php_stream_filter_append(&fp->readfilters, filter);

// TODO: refactor to avoid reallocation ???
//??? entry.uncompressed_filesize = php_stream_copy_to_mem(fp, &actual_alias, entry.uncompressed_filesize, 0)
{
zend_string *str = php_stream_copy_to_mem(fp, entry.uncompressed_filesize, 0);
if (str) {
entry.uncompressed_filesize = ZSTR_LEN(str);
actual_alias = estrndup(ZSTR_VAL(str), ZSTR_LEN(str));
zend_string_release_ex(str, 0);
} else {
actual_alias = NULL;
entry.uncompressed_filesize = 0;
}
}
actual_alias = php_stream_copy_to_mem(fp, entry.uncompressed_filesize, 0);

if (!entry.uncompressed_filesize) {
php_stream_filter_remove(filter, 1);
Expand All @@ -658,20 +649,7 @@ zend_result phar_parse_zipfile(php_stream *fp, const char *fname, size_t fname_l
}

php_stream_filter_append(&fp->readfilters, filter);

// TODO: refactor to avoid reallocation ???
//??? entry.uncompressed_filesize = php_stream_copy_to_mem(fp, &actual_alias, entry.uncompressed_filesize, 0)
{
zend_string *str = php_stream_copy_to_mem(fp, entry.uncompressed_filesize, 0);
if (str) {
entry.uncompressed_filesize = ZSTR_LEN(str);
actual_alias = estrndup(ZSTR_VAL(str), ZSTR_LEN(str));
zend_string_release_ex(str, 0);
} else {
actual_alias = NULL;
entry.uncompressed_filesize = 0;
}
}
actual_alias = php_stream_copy_to_mem(fp, entry.uncompressed_filesize, 0);

if (!entry.uncompressed_filesize) {
php_stream_filter_remove(filter, 1);
Expand All @@ -682,19 +660,7 @@ zend_result phar_parse_zipfile(php_stream *fp, const char *fname, size_t fname_l
php_stream_filter_flush(filter, 1);
php_stream_filter_remove(filter, 1);
} else {
// TODO: refactor to avoid reallocation ???
//??? entry.uncompressed_filesize = php_stream_copy_to_mem(fp, &actual_alias, entry.uncompressed_filesize, 0)
{
zend_string *str = php_stream_copy_to_mem(fp, entry.uncompressed_filesize, 0);
if (str) {
entry.uncompressed_filesize = ZSTR_LEN(str);
actual_alias = estrndup(ZSTR_VAL(str), ZSTR_LEN(str));
zend_string_release_ex(str, 0);
} else {
actual_alias = NULL;
entry.uncompressed_filesize = 0;
}
}
actual_alias = php_stream_copy_to_mem(fp, entry.uncompressed_filesize, 0);

if (!entry.uncompressed_filesize) {
zend_string_release_ex(entry.filename, entry.is_persistent);
Expand Down Expand Up @@ -725,35 +691,38 @@ zend_result phar_parse_zipfile(php_stream *fp, const char *fname, size_t fname_l

zend_hash_str_add_ptr(&(PHAR_G(phar_fname_map)), mydata->fname, fname_len, mydata);

if (actual_alias) {
if (actual_alias != NULL) {
phar_archive_data *fd_ptr;

if (!phar_validate_alias(actual_alias, mydata->alias_len)) {
if (!phar_validate_alias(ZSTR_VAL(actual_alias), ZSTR_LEN(actual_alias))) {
if (error) {
spprintf(error, 4096, "phar error: invalid alias \"%s\" in zip-based phar \"%s\"", actual_alias, fname);
spprintf(error, 4096, "phar error: invalid alias \"%s\" in zip-based phar \"%s\"", ZSTR_VAL(actual_alias), fname);
}
efree(actual_alias);
zend_string_release_ex(actual_alias, 0);
zend_hash_str_del(&(PHAR_G(phar_fname_map)), mydata->fname, fname_len);
return FAILURE;
}

mydata->is_temporary_alias = 0;

if (NULL != (fd_ptr = zend_hash_str_find_ptr(&(PHAR_G(phar_alias_map)), actual_alias, mydata->alias_len))) {
if (SUCCESS != phar_free_alias(fd_ptr)) {
if (NULL != (fd_ptr = zend_hash_str_find_ptr(&(PHAR_G(phar_alias_map)), ZSTR_VAL(actual_alias), ZSTR_LEN(actual_alias)))) {
if (SUCCESS != phar_free_alias(fd_ptr, ZSTR_VAL(actual_alias), ZSTR_LEN(actual_alias))) {
if (error) {
spprintf(error, 4096, "phar error: Unable to add zip-based phar \"%s\" with implicit alias, alias is already in use", fname);
}
efree(actual_alias);
zend_string_release_ex(actual_alias, 0);
zend_hash_str_del(&(PHAR_G(phar_fname_map)), mydata->fname, fname_len);
return FAILURE;
}
}

mydata->alias = entry.is_persistent ? pestrndup(actual_alias, mydata->alias_len, 1) : actual_alias;


if (entry.is_persistent) {
efree(actual_alias);
mydata->alias = pestrndup(ZSTR_VAL(actual_alias), ZSTR_LEN(actual_alias), 1);
zend_string_release_ex(actual_alias, 0);
} else {
mydata->alias = estrndup(ZSTR_VAL(actual_alias), ZSTR_LEN(actual_alias));
zend_string_release_ex(actual_alias, 0);
}

zend_hash_str_add_ptr(&(PHAR_G(phar_alias_map)), mydata->alias, mydata->alias_len, mydata);
Expand Down
Loading