summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Joye <pajoye@php.net>2010-12-09 17:04:29 +0000
committerPierre Joye <pajoye@php.net>2010-12-09 17:04:29 +0000
commitec20844001b85aa4dd24c71c8adc209fdae73915 (patch)
tree794bc5293c2dfcd7f0a118da13beaa639d9687a4
parent5ab2577d638551ed9b8111a1ad21d252807b0fd5 (diff)
downloadphp-git-ec20844001b85aa4dd24c71c8adc209fdae73915.tar.gz
- missing merge fix for #53352
-rw-r--r--main/fopen_wrappers.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index a952a971e2..60452287c3 100644
--- a/main/fopen_wrappers.c
+++ b/main/fopen_wrappers.c
@@ -172,6 +172,9 @@ PHPAPI int php_check_specific_open_basedir(const char *basedir, const char *path
resolved_basedir[resolved_basedir_len] = PHP_DIR_SEPARATOR;
resolved_basedir[++resolved_basedir_len] = '\0';
}
+ } else {
+ resolved_basedir[resolved_basedir_len++] = PHP_DIR_SEPARATOR;
+ resolved_basedir[resolved_basedir_len] = '\0';
}
resolved_name_len = strlen(resolved_name);