mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-25 17:59:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix extension detection for executable=2

Browse Source
This commit is contained in:
Greg Beaver 2008-04-23 18:22:09 +00:00
parent c034683550
commit 3d890f09a8
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ext/phar/phar.c
View File

@ -1509,10 +1509,16 @@ static int phar_check_str(const char *fname, const char *ext_str, int ext_len, i
}
}
/* data phars need only contain a single non-"." to be valid */
pos = strstr(ext_str, ".phar");
if (!(pos && (*(pos - 1) != '/')
&& (pos += 5) && (*pos == '\0' || *pos == '/' || *pos == '.')) && *(ext_str + 1) != '.' && *(ext_str + 1) != '/' && *(ext_str + 1) != '\0') {
return phar_analyze_path(fname, ext_str, ext_len, for_create TSRMLS_CC);
if (!executable) {
pos = strstr(ext_str, ".phar");
if (!(pos && (*(pos - 1) != '/')
&& (pos += 5) && (*pos == '\0' || *pos == '/' || *pos == '.')) && *(ext_str + 1) != '.' && *(ext_str + 1) != '/' && *(ext_str + 1) != '\0') {
return phar_analyze_path(fname, ext_str, ext_len, for_create TSRMLS_CC);
}
} else {
if (*(ext_str + 1) != '.' && *(ext_str + 1) != '/' && *(ext_str + 1) != '\0') {
return phar_analyze_path(fname, ext_str, ext_len, for_create TSRMLS_CC);
}
}
return FAILURE;
}
@ -1599,7 +1605,7 @@ next_extension:
if (!pos) {
return FAILURE;
}
if (pos != filename && (*(pos - 1) == '/' || *(pos - 1) == '\0')) {
while (pos != filename && (*(pos - 1) == '/' || *(pos - 1) == '\0')) {
pos = strchr(pos + 1, '.');
if (!pos) {
return FAILURE;