Skip to content

ext/phar: Drop unnecessary Windows code as filepath is already unixied. #21764

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

Merged
Girgias merged 1 commit into from
Apr 15, 2026
+2 −11
Merged

ext/phar: Drop unnecessary Windows code as filepath is already unixied. #21764

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
13 changes: 2 additions & 11 deletions ext/phar/phar.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2217,21 +2217,12 @@ zend_result phar_split_fname(const char *filename, size_t filename_len, char **a
if (entry) {
if (ext_str[ext_len]) {
size_t computed_entry_len = filename_len - *arch_len;
#ifdef PHP_WIN32
/* TODO: can we handle the unixify path in phar_fix_filepath() directly ? */
char *fixed_path_for_windows = estrndup(ext_str+ext_len, computed_entry_len);
phar_unixify_path_separators(fixed_path_for_windows, computed_entry_len);
zend_string *entry_str = phar_fix_filepath(fixed_path_for_windows, computed_entry_len, false);
*entry = estrndup(ZSTR_VAL(entry_str), ZSTR_LEN(entry_str));
*entry_len = ZSTR_LEN(entry_str);
zend_string_release_ex(entry_str, false);
efree(fixed_path_for_windows);
#else
/* We don't need to unixify the path on Windows,
* as ext_str is derived from filename that was already unixify */
zend_string *entry_str = phar_fix_filepath(ext_str+ext_len, computed_entry_len, false);
*entry = estrndup(ZSTR_VAL(entry_str), ZSTR_LEN(entry_str));
*entry_len = ZSTR_LEN(entry_str);
zend_string_release_ex(entry_str, false);
#endif
} else {
*entry_len = 1;
*entry = estrndup("/", 1);
Expand Down