Fixed bug #27498 (bogus safe_mode error on nonexistent directories for

chdir() and opendir() functions).

diff --git a/ext/standard/dir.c b/ext/standard/dir.c
index 963244585486434c603799a5da938b22afc502d6..0d9bdfb90bf63b29473bf9f42845bae9222cb09b 100644 (file)
--- a/ext/standard/dir.c
+++ b/ext/standard/dir.c
@@ -283,7 +283,7 @@ PHP_FUNCTION(chdir)
                RETURN_FALSE;
        }
 
-       if (PG(safe_mode) && !php_checkuid(str, NULL, CHECKUID_ALLOW_ONLY_FILE)) {
+       if (PG(safe_mode) && !php_checkuid(str, NULL, CHECKUID_CHECK_FILE_AND_DIR)) {
                RETURN_FALSE;
        }
        ret = VCWD_CHDIR(str);

diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c
index c60063f35522ae0730a568a4a9780c17da45b6dc..b1b27f604991b5ab550695e74186c693dc17e063 100644 (file)
--- a/main/streams/plain_wrapper.c
+++ b/main/streams/plain_wrapper.c
@@ -856,7 +856,7 @@ static php_stream *php_plain_files_dir_opener(php_stream_wrapper *wrapper, char
                return NULL;
        }
        
-       if (PG(safe_mode) &&(!php_checkuid(path, NULL, CHECKUID_ALLOW_ONLY_FILE))) {
+       if (PG(safe_mode) &&(!php_checkuid(path, NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
                return NULL;
        }