MFH fix for bug 19292

rlerdorf · rlerdorf · commit a12abe498e13 · 2002-09-28T16:27:53.000Z
diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
@@ -226,8 +226,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 on and safe_mode_include_dir is available */
-	if (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;
@@ -268,7 +268,7 @@ PHPAPI int php_check_safe_mode_include_dir(char *path TSRMLS_DC)
 	}
 
 	/* Nothing to check... */
-	return -1;
+	return 0;
 }
 /* }}} */
 

Original file line number	Diff line number	Diff line change
`@@ -226,8 +226,8 @@ PHPAPI int php_check_open_basedir(const char *path TSRMLS_DC)`
`226`	`226`	`PHPAPI int php_check_safe_mode_include_dir(char *path TSRMLS_DC)`
`227`	`227`	`{`
`228`	`228`	`/* Only check when safe_mode on and safe_mode_include_dir is available */`
`229`		`- if (PG(safe_mode) && PG(safe_mode_include_dir) &&`
`230`		`- *PG(safe_mode_include_dir))`
	`229`	`+ if (((PG(open_basedir) && *PG(open_basedir)) \|\| PG(safe_mode))`
	`230`	`+ && PG(safe_mode_include_dir) && *PG(safe_mode_include_dir))`
`231`	`231`	`{`
`232`	`232`	`char *pathbuf;`
`233`	`233`	`char *ptr;`
`@@ -268,7 +268,7 @@ PHPAPI int php_check_safe_mode_include_dir(char *path TSRMLS_DC)`
`268`	`268`	`}`
`269`	`269`
`270`	`270`	`/* Nothing to check... */`
`271`		`- return -1;`
	`271`	`+ return 0;`
`272`	`272`	`}`
`273`	`273`	`/* }}} */`
`274`	`274`