Fixed bug #42027 is_file() / is_dir() matches file/dirnames with wildcard char or...

diff --git a/NEWS b/NEWS
index c552481e643d7416d6d6c1d2e985ca6ca39bbad3..b3db3c85337deb3b6bdc99c48bf78921c8aa0934 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -62,6 +62,8 @@ PHP                                                                        NEWS
 - Fixed bug #42072 (No warning message for clearstatcache() with arguments).
   (Ilia)
 - Fixed bug #42071 (ini scanner allows using NULL as option name). (Jani)
+- Fixed bug #42027 is_file() / is_dir() matches file/dirnames with wildcard
+  char or trailing slash. (Dmitry)
 - Fixed bug #42019 (configure option --with-adabas=DIR does not work). (Jani)
 - Fixed bug #42015 (ldap_rename(): server error "DSA is unwilling to perform").
   (bob at mroczka dot com, Jani)

diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c
index 8e14365abe648603e4dd7ffa4929324253698d54..7bec8f2460a49dae6a438e904abce9e5291369da 100644 (file)
--- a/TSRM/tsrm_virtual_cwd.c
+++ b/TSRM/tsrm_virtual_cwd.c
@@ -565,6 +565,13 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 #endif
 no_realpath:
 
+#ifdef TSRM_WIN32
+               if (memchr(path, '*', path_length) ||
+                   memchr(path, '?', path_length)) {
+                       return 1;
+               }
+#endif
+
                free_path = path_copy = tsrm_strndup(path, path_length);
                CWD_STATE_COPY(&old_state, state);