php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-28 10:43:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Fix #48746, improve fix to support all possible cases (see latest comment in the report)

Browse Source
This commit is contained in:
Pierre Joye
2009-09-14 18:46:56 +00:00
parent d3ae759391
commit 56d4d95f2d
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TSRM/tsrm_virtual_cwd.c
+20 -2
View File
@@ -905,6 +905,7 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
time_t t;
int ret;
int add_slash;
void *tmp;
TSRMLS_FETCH();
if (path_length == 0 || path_length >= MAXPATHLEN-1) {
@@ -1049,7 +1050,16 @@ verify:
CWD_STATE_COPY(&old_state, state);
state->cwd_length = path_length;
state->cwd = (char *) realloc(state->cwd, state->cwd_length+1);
tmp = realloc(state->cwd, state->cwd_length+1);
if (tmp == NULL) {
#if VIRTUAL_CWD_DEBUG
fprintf (stderr, "Out of memory\n");
#endif
return 1;
}
state->cwd = (char *) tmp;
memcpy(state->cwd, resolved_path, state->cwd_length+1);
if (verify_path(state)) {
CWD_STATE_FREE(state);
@@ -1061,7 +1071,15 @@ verify:
}
} else {
state->cwd_length = path_length;
state->cwd = (char *) realloc(state->cwd, state->cwd_length+1);
tmp = realloc(state->cwd, state->cwd_length+1);
if (tmp == NULL) {
#if VIRTUAL_CWD_DEBUG
fprintf (stderr, "Out of memory\n");
#endif
return 1;
}
state->cwd = (char *) tmp;
memcpy(state->cwd, resolved_path, state->cwd_length+1);
ret = 0;
}