archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 23:18:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

- Fix problem with VIRTUAL_DIR and relative paths containing ..

Browse source
This commit is contained in:
Andi Gutmans 2000-06-28 17:30:30 +00:00
parent b952c2c95a
commit da8843aa55
1 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

27
main/php_virtual_cwd.c
View file

@ -281,9 +281,30 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
#ifndef ZEND_WIN32 #ifndef ZEND_WIN32
if (strstr(path, "..")) { if (strstr(path, "..")) {
/* If .. is found then we need to resolve real path as the .. code doesn't work with symlinks */ /* If .. is found then we need to resolve real path as the .. code doesn't work with symlinks */
if (realpath(path, resolved_path)) { if (IS_ABSOLUTE_PATH(path, path_length)) {
path = resolved_path; if (realpath(path, resolved_path)) {
path_length = strlen(path); path = resolved_path;
path_length = strlen(path);
}
} else { /* Concat current directory with relative path and then run realpath() on it */
char *tmp;
char *ptr;
ptr = tmp = (char *) malloc(state->cwd_length+path_length+sizeof("/"));
if (!tmp) {
return 1;
}
memcpy(ptr, state->cwd, state->cwd_length);
ptr += state->cwd_length;
*ptr++ = DEFAULT_SLASH;
memcpy(ptr, path, path_length);
ptr += path_length;
*ptr = '\0';
if (realpath(tmp, resolved_path)) {
path = resolved_path;
path_length = strlen(path);
}
free(tmp);
} }
} }
#endif #endif