diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2004-03-16 00:31:22 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2004-03-16 00:31:22 +0000 |
| commit | 542b034efafc4f88cc9162ef01448e792977bdea (patch) | |
| tree | 74ab557d0c155d6349da2e04cd82abeefbaa2a4c | |
| parent | 83b2d923f8e308161a96e217012bc49688750478 (diff) | |
| download | php-git-542b034efafc4f88cc9162ef01448e792977bdea.tar.gz | |
Fixed bug #27559 (Corrected open_basedir resolving logic).
| -rw-r--r-- | main/fopen_wrappers.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c index efa2a6deda..d29a33b5b7 100644 --- a/main/fopen_wrappers.c +++ b/main/fopen_wrappers.c @@ -131,11 +131,13 @@ PHPAPI int php_check_specific_open_basedir(const char *basedir, const char *path if ((expand_filepath(path, resolved_name TSRMLS_CC) != NULL) && (expand_filepath(local_open_basedir, resolved_basedir TSRMLS_CC) != NULL)) { /* Handler for basedirs that end with a / */ resolved_basedir_len = strlen(resolved_basedir); - if (resolved_basedir[resolved_basedir_len -1] != PHP_DIR_SEPARATOR) { - resolved_basedir[resolved_basedir_len] = PHP_DIR_SEPARATOR; - resolved_basedir[++resolved_basedir_len] = '\0'; + if (basedir[strlen(basedir) - 1] == PHP_DIR_SEPARATOR) { + if (resolved_basedir[resolved_basedir_len - 1] == '/') { + resolved_basedir[resolved_basedir_len - 1] = PHP_DIR_SEPARATOR; + resolved_basedir[++resolved_basedir_len] = '\0'; + } } - + if (path[strlen(path)-1] == PHP_DIR_SEPARATOR) { resolved_name_len = strlen(resolved_name); if (resolved_name[resolved_name_len - 1] != PHP_DIR_SEPARATOR) { |