diff options
| author | Zeev Suraski <zeev@php.net> | 2000-04-10 22:50:32 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2000-04-10 22:50:32 +0000 |
| commit | 8ec20a16ed09b37996c42edcdeb7d08d9a623150 (patch) | |
| tree | 89705b54daf90a347d16396aa6d94acccf3baa03 | |
| parent | 09ac924559763d6974e9248cf0ffbd4ac04107bc (diff) | |
| download | php-git-8ec20a16ed09b37996c42edcdeb7d08d9a623150.tar.gz | |
Fix another missing opened_path assignment
| -rw-r--r-- | main/fopen_wrappers.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c index 116985675e..64d59be820 100644 --- a/main/fopen_wrappers.c +++ b/main/fopen_wrappers.c @@ -369,15 +369,23 @@ PHPAPI FILE *php_fopen_with_path(char *filename, char *mode, char *path, char ** } return fp; } else { - if (php_check_open_basedir(filename)) return NULL; - return PHP_FOPEN(filename, mode); + if (php_check_open_basedir(filename)) { + return NULL; + } + fp = PHP_FOPEN(filename, mode); + if (fp && opened_path) { + *opened_path = expand_filepath(filename); + } + return fp; } } if (!path || (path && !*path)) { if (PG(safe_mode) && (!php_checkuid(filename, cm))) { return NULL; } - if (php_check_open_basedir(filename)) return NULL; + if (php_check_open_basedir(filename)) { + return NULL; + } fp = PHP_FOPEN(filename, mode); if (fp && opened_path) { *opened_path = strdup(filename); |