php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

phar: Use a loop instead of goto when looking for extensions (#20289)

Browse Source 
This gets rid of a TODO and makes the code clearer.
This commit is contained in:
Niels Dossche
2025-10-25 21:01:28 +02:00
committed by GitHub
parent 0cdf7bec96
commit 3a9d59971b
1 changed files with 27 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
ext/phar/phar.c
View File

@@ -2034,45 +2034,40 @@ woohoo:
}
}
// TODO Use some sort of loop here instead of a goto
pos = memchr(filename + 1, '.', filename_len);
next_extension:
if (!pos) {
return FAILURE;
}
while (pos != filename && (*(pos - 1) == '/' || *(pos - 1) == '\0')) {
pos = memchr(pos + 1, '.', filename_len - (pos - filename) - 1);
if (!pos) {
return FAILURE;
while (pos) {
while (pos != filename && (*(pos - 1) == '/' || *(pos - 1) == '\0')) {
pos = memchr(pos + 1, '.', filename_len - (pos - filename) - 1);
if (!pos) {
return FAILURE;
}
}
}
slash = memchr(pos, '/', filename_len - (pos - filename));
slash = memchr(pos, '/', filename_len - (pos - filename));
if (!slash) {
/* this is a url like "phar://blah.phar" with no directory */
if (!slash) {
/* this is a url like "phar://blah.phar" with no directory */
*ext_str = pos;
*ext_len = strlen(pos);
/* file extension must contain "phar" */
return phar_check_str(filename, *ext_str, *ext_len, executable, for_create);
}
/* we've found an extension that ends at a directory separator */
*ext_str = pos;
*ext_len = strlen(pos);
*ext_len = slash - pos;
/* file extension must contain "phar" */
return phar_check_str(filename, *ext_str, *ext_len, executable, for_create);
}
if (phar_check_str(filename, *ext_str, *ext_len, executable, for_create) == SUCCESS) {
return SUCCESS;
}
/* we've found an extension that ends at a directory separator */
*ext_str = pos;
*ext_len = slash - pos;
if (phar_check_str(filename, *ext_str, *ext_len, executable, for_create) == SUCCESS) {
return SUCCESS;
}
/* look for more extensions */
pos = strchr(pos + 1, '.');
if (pos) {
*ext_str = NULL;
*ext_len = 0;
goto next_extension;
/* look for more extensions */
pos = strchr(pos + 1, '.');
if (pos) {
*ext_str = NULL;
*ext_len = 0;
}
}
return FAILURE;