diff options
| author | Dmitry Stogov <dmitry@php.net> | 2007-07-24 09:07:33 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2007-07-24 09:07:33 +0000 |
| commit | db97db94306409ce0860f82ab7dbc83b336e8cda (patch) | |
| tree | 37cf8d920cd6bcee69b4979e5efad20631ccebe4 | |
| parent | 5cdae5bdbb1847c4d6e512c62d0ef7e7e1e9c608 (diff) | |
| download | php-git-db97db94306409ce0860f82ab7dbc83b336e8cda.tar.gz | |
Fixed bug #42027 is_file() / is_dir() matches file/dirnames with wildcard char or trailing slash
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | TSRM/tsrm_virtual_cwd.c | 7 |
2 files changed, 9 insertions, 0 deletions
@@ -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 8e14365abe..7bec8f2460 100644 --- 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); |