diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2005-12-20 14:24:14 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2005-12-20 14:24:14 +0000 |
| commit | 5df2f5df42de97075b388521e19c005f5f0d02f0 (patch) | |
| tree | 8572a4e52c38b3334c3a78ff9cf4e9d91f8e309b | |
| parent | efff8a45e2f55ddd43065e8295b4976e99671e55 (diff) | |
| download | php-git-5df2f5df42de97075b388521e19c005f5f0d02f0.tar.gz | |
Fixed bug #31347 (is_dir and is_file (incorrectly) return true for any string
greater then 255 characters).
| -rw-r--r-- | TSRM/tsrm_config_common.h | 2 | ||||
| -rw-r--r-- | TSRM/tsrm_virtual_cwd.c | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/TSRM/tsrm_config_common.h b/TSRM/tsrm_config_common.h index bdd171e619..62a7c8efc0 100644 --- a/TSRM/tsrm_config_common.h +++ b/TSRM/tsrm_config_common.h @@ -42,6 +42,8 @@ char *alloca (); #ifndef MAXPATHLEN # ifdef PATH_MAX # define MAXPATHLEN PATH_MAX +# elif defined(MAX_PATH) +# define MAXPATHLEN MAX_PATH # else # define MAXPATHLEN 256 # endif diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c index baf5843d00..cd2c6d2c5d 100644 --- a/TSRM/tsrm_virtual_cwd.c +++ b/TSRM/tsrm_virtual_cwd.c @@ -478,13 +478,14 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func #endif #if defined(TSRM_WIN32) { - char *dummy = NULL; int new_path_length; - new_path_length = GetLongPathName(path, dummy, 0) + 1; + new_path_length = GetLongPathName(path, NULL, 0); if (new_path_length == 0) { return 1; } + + /* GetLongPathName already counts the \0 */ new_path = (char *) malloc(new_path_length); if (!new_path) { return 1; @@ -856,7 +857,9 @@ CWD_API int virtual_stat(const char *path, struct stat *buf TSRMLS_DC) int retval; CWD_STATE_COPY(&new_state, &CWDG(cwd)); - virtual_file_ex(&new_state, path, NULL, 1); + if (virtual_file_ex(&new_state, path, NULL, 1)) { + return -1; + } retval = stat(new_state.cwd, buf); |