Fix bug #65489: glob() basedir check is inconsistent

This removes the inconsistent and incorrectly working open basedir check
on pattern in glob. It means that an empty array will be returned even
if the whole pattern is outside the open basedir restriction.

Author: bukka

NEWS

@@ -8,6 +8,9 @@ PHP                                                                        NEWS
   . Removed redundant RuntimeExceptions from Randomizer methods. The
     exceptions thrown by the engines will be exposed directly. (timwolla)
 
+- Standard:
+  . Fixed bug #65489 (glob() basedir check is inconsistent). (Jakub Zelenka)
+
 04 Aug 2022, PHP 8.2.0beta2
 
 - Core:

UPGRADING

@@ -39,6 +39,9 @@ PHP 8.2 UPGRADE NOTES
     further details.
 
 - Standard:
+  . glob() returns empty array if all paths are restricted by open_basedir.
+    Previously the error was returned but that behavior was not consistent and
+    did not work correctly for all patterns.
   . strtolower() and strtoupper() are no longer locale-sensitive. They now
     perform ASCII case conversion, as if the locale were "C". Use
     mb_strtolower() if you want localized case conversion. Similarly, stristr,

ext/standard/dir.c

@@ -471,18 +471,6 @@ PHP_FUNCTION(glob)
 	if (!globbuf.gl_pathc || !globbuf.gl_pathv) {
 #ifdef GLOB_NOMATCH
 no_results:
-#endif
-#ifndef PHP_WIN32
-		/* Paths containing '*', '?' and some other chars are
-		illegal on Windows but legit on other platforms. For
-		this reason the direct basedir check against the glob
-		query is senseless on windows. For instance while *.txt
-		is a pretty valid filename on EXT3, it's invalid on NTFS. */
-		if (PG(open_basedir) && *PG(open_basedir)) {
-			if (php_check_open_basedir_ex(pattern, 0)) {
-				RETURN_FALSE;
-			}
-		}
 #endif
 		array_init(return_value);
 		return;

ext/standard/tests/file/bug41655_1.phpt

@@ -17,5 +17,6 @@ var_dump($a);
 echo "Done\n";
 ?>
 --EXPECT--
-bool(false)
+array(0) {
+}
 Done

ext/standard/tests/file/glob_variation5.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Test glob() function: ensure no platform difference, variation 3
 --SKIPIF--
-<?php if( substr(PHP_OS, 0, 3) == "WIN" ) {die('skip not valid on Windows');} ?>
+<?php if( substr(PHP_OS, 0, 3) == "WIN" ) die('skip not valid directory on Windows'); ?>
 --FILE--
 <?php
 $path = __DIR__;
@@ -19,10 +19,16 @@ var_dump(glob("$path/directly_not_exists"));
 var_dump($open_basedir == ini_get('open_basedir'));
 ?>
 --EXPECT--
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-bool(false)
+array(0) {
+}
+array(0) {
+}
+array(0) {
+}
+array(0) {
+}
+array(0) {
+}
+array(0) {
+}
 bool(true)

ext/standard/tests/file/glob_variation6.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Test glob() function: ensure no platform difference, variation 4
 --SKIPIF--
-<?php if( substr(PHP_OS, 0, 3) != "WIN" ) {die('skip only valid on Windows');} ?>
+<?php if( substr(PHP_OS, 0, 3) != "WIN" ) die('skip only valid directory on Windows'); ?>
 --FILE--
 <?php
 $path = __DIR__;