summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--main/fopen_wrappers.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index 00dec4e100..72b8e0a7bc 100644
--- a/main/fopen_wrappers.c
+++ b/main/fopen_wrappers.c
@@ -200,8 +200,8 @@ PHPAPI int php_check_open_basedir(const char *path TSRMLS_DC)
PHPAPI int php_check_safe_mode_include_dir(char *path TSRMLS_DC)
{
/* Only check when safe_mode or open_basedir is on and safe_mode_include_dir is available */
- if (((PG(open_basedir) && *PG(open_basedir)) || PG(safe_mode)) && PG(safe_mode_include_dir) &&
- *PG(safe_mode_include_dir))
+ if (((PG(open_basedir) && *PG(open_basedir)) || PG(safe_mode)) &&
+ PG(safe_mode_include_dir) && *PG(safe_mode_include_dir))
{
char *pathbuf;
char *ptr;
@@ -242,7 +242,7 @@ PHPAPI int php_check_safe_mode_include_dir(char *path TSRMLS_DC)
}
/* Nothing to check... */
- return -1;
+ return 0;
}
/* }}} */