summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Dovgal <tony2001@php.net>2006-08-03 14:17:58 +0000
committerAntony Dovgal <tony2001@php.net>2006-08-03 14:17:58 +0000
commit5cff1c6e7e83cad9c3d2b4ec68777e585c4baa4b (patch)
treee7fbca70062eb32be561f7dfe4e8e933578b5c31
parent58c227828481e5bb9171a8576b450c3f1a3c2ad7 (diff)
downloadphp-git-5cff1c6e7e83cad9c3d2b4ec68777e585c4baa4b.tar.gz
MFH: fix #38276 (file_exists() works incorrectly with long filenames on Windows)
-rw-r--r--NEWS2
-rw-r--r--TSRM/tsrm_virtual_cwd.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index b6bec599f3..4c411c6c0b 100644
--- a/NEWS
+++ b/NEWS
@@ -34,6 +34,8 @@ PHP NEWS
(Tony)
- Fixed bug #38278 (session_cache_expire()'s value does not match phpinfo's
session.cache_expire). (Tony)
+- Fixed bug #38276 (file_exists() works incorrectly with long filenames
+ on Windows). (Ilia, Tony)
- Fixed bug #38269 (fopen wrapper doesn't fail on invalid hostname with
curlwrappers enabled). (Tony)
- Fixed bug #38261 (openssl_x509_parse() leaks with invalid cert) (Pierre)
diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c
index 59a6b81d1d..3c713a1f79 100644
--- a/TSRM/tsrm_virtual_cwd.c
+++ b/TSRM/tsrm_virtual_cwd.c
@@ -706,7 +706,9 @@ CWD_API FILE *virtual_fopen(const char *path, const char *mode TSRMLS_DC)
}
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;
+ }
f = fopen(new_state.cwd, mode);