clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 02:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

* fixed bug #60704 unlink() bug with some files path

Browse Source 
Reviewed by: rasmus@
This commit is contained in:
Mateusz Kocielski 2012-02-14 14:14:30 +00:00
parent 4ed1640b35
commit ddcf55b640
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
main/streams/plain_wrapper.c
View File

@ -1010,9 +1010,12 @@ static php_stream *php_plain_files_stream_opener(php_stream_wrapper *wrapper, ch
static int php_plain_files_url_stater(php_stream_wrapper *wrapper, char *url, int flags, php_stream_statbuf *ssb, php_stream_context *context TSRMLS_DC)
{
char *p;
if (strncmp(url, "file://", sizeof("file://") - 1) == 0) {
url += sizeof("file://") - 1;
if ((p = strstr(url, "://")) != NULL) {
if (p < strchr(url, '/')) {
url = p + 3;
}
}
if (PG(safe_mode) &&(!php_checkuid_ex(url, NULL, CHECKUID_CHECK_FILE_AND_DIR, (flags & PHP_STREAM_URL_STAT_QUIET) ? CHECKUID_NO_ERRORS : 0))) {
@ -1045,7 +1048,9 @@ static int php_plain_files_unlink(php_stream_wrapper *wrapper, char *url, int op
int ret;
if ((p = strstr(url, "://")) != NULL) {
url = p + 3;
if (p < strchr(url, '/')) {
url = p + 3;
}
}
if (options & ENFORCE_SAFE_MODE) {
@ -1093,11 +1098,15 @@ static int php_plain_files_rename(php_stream_wrapper *wrapper, char *url_from, c
#endif
if ((p = strstr(url_from, "://")) != NULL) {
url_from = p + 3;
if (p < strchr(url_from, '/')) {
url_from = p + 3;
}
}
if ((p = strstr(url_to, "://")) != NULL) {
url_to = p + 3;
if (p < strchr(url_to, '/')) {
url_to = p + 3;
}
}
if (PG(safe_mode) && (!php_checkuid(url_from, NULL, CHECKUID_CHECK_FILE_AND_DIR) ||
@ -1168,7 +1177,9 @@ static int php_plain_files_mkdir(php_stream_wrapper *wrapper, char *dir, int mod
char *p;
if ((p = strstr(dir, "://")) != NULL) {
dir = p + 3;
if (p < strchr(dir, '/')) {
dir = p + 3;
}
}
if (!recursive) {