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 possible NULL deref

Browse source
This commit is contained in:
Pierre Joye 2011-01-10 00:30:07 +00:00
parent eda798fd7a
commit 26bb38e68b
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
TSRM/tsrm_virtual_cwd.c
View file

@ -1874,6 +1874,9 @@ CWD_API char *tsrm_realpath(const char *path, char *real_path TSRMLS_DC) /* {{{
/* realpath("") returns CWD */ /* realpath("") returns CWD */
if (!*path) { if (!*path) {
new_state.cwd = (char*)malloc(1); new_state.cwd = (char*)malloc(1);
if (new_state.cwd == NULL) {
return NULL;
}
new_state.cwd[0] = '\0'; new_state.cwd[0] = '\0';
new_state.cwd_length = 0; new_state.cwd_length = 0;
if (VCWD_GETCWD(cwd, MAXPATHLEN)) { if (VCWD_GETCWD(cwd, MAXPATHLEN)) {
@ -1885,6 +1888,9 @@ CWD_API char *tsrm_realpath(const char *path, char *real_path TSRMLS_DC) /* {{{
new_state.cwd_length = strlen(cwd); new_state.cwd_length = strlen(cwd);
} else { } else {
new_state.cwd = (char*)malloc(1); new_state.cwd = (char*)malloc(1);
if (new_state.cwd == NULL) {
return NULL;
}
new_state.cwd[0] = '\0'; new_state.cwd[0] = '\0';
new_state.cwd_length = 0; new_state.cwd_length = 0;
} }