From 42dcaa63eae8d79765be26fb374ac7b459b95ca6 Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Tue, 27 Sep 2005 15:08:11 +0000 Subject: [PATCH] MFH: Fixed bug #32937 (open_basedir looses trailing / in the limiter). --- main/fopen_wrappers.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c index a31a63472d0..4aab8b6222c 100644 --- a/main/fopen_wrappers.c +++ b/main/fopen_wrappers.c @@ -109,8 +109,8 @@ PHPAPI int php_check_specific_open_basedir(const char *basedir, const char *path /* Handler for basedirs that end with a / */ resolved_basedir_len = strlen(resolved_basedir); if (basedir[strlen(basedir) - 1] == PHP_DIR_SEPARATOR) { - if (resolved_basedir[resolved_basedir_len - 1] == '/') { - resolved_basedir[resolved_basedir_len - 1] = PHP_DIR_SEPARATOR; + if (resolved_basedir[resolved_basedir_len - 1] != PHP_DIR_SEPARATOR) { + resolved_basedir[resolved_basedir_len] = PHP_DIR_SEPARATOR; resolved_basedir[++resolved_basedir_len] = '\0'; } }