- fix bug #47358, glob returns error, should be empty array()

Conflicts: ext/standard/dir.c
14 years ago · 481c4715d4
3 changed files with 6 additions and 4 deletions
--- a/3
+++ b/3
@ -2,6 +2,9 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2014, PHP 5.4.33

+- Core:
+  . Fixed bug #47358 (glob returns error, should be empty array()). (Pierre)
+
 - OpenSSL:
  . Fixed bug #41631 (socket timeouts not honored in blocking SSL reads)
    (Daniel Lowrey).
--- a/ext/standard/dir.c
+++ b/ext/standard/dir.c
@ -492,9 +492,7 @@ PHP_FUNCTION(glob)
 	if (!globbuf.gl_pathc || !globbuf.gl_pathv) {
 no_results:
 		if (PG(open_basedir) && *PG(open_basedir)) {
-			struct stat s;
-
-			if (0 != VCWD_STAT(pattern, &s) || S_IFDIR != (s.st_mode & S_IFMT)) {
+			if (php_check_open_basedir_ex(pattern, 0 TSRMLS_CC)) {
 				RETURN_FALSE;
 			}
 		}
--- a/ext/standard/tests/file/glob_variation3.phpt
+++ b/ext/standard/tests/file/glob_variation3.phpt
@ -15,5 +15,6 @@ var_dump(glob("$path/*.none"));
 --EXPECT--
 array(0) {
 }
-bool(false)
+array(0) {
+}
 ==DONE==