diff options
| author | Anatol Belski <ab@php.net> | 2015-04-28 15:32:22 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-04-28 15:32:22 +0200 |
| commit | 4af9ca544edb6926886cbbe76c066fa998551d07 (patch) | |
| tree | 780e12b19dddd1b814d965f9da47a8d22770e2c3 | |
| parent | 5cfb81d5b0df2c602df57b634b419e0c9c9d097f (diff) | |
| parent | 3cd3881574b5b3c4e730d8be5d757a8bc8f374fa (diff) | |
| download | php-git-4af9ca544edb6926886cbbe76c066fa998551d07.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
backported patch for bug #69472
| -rw-r--r-- | Zend/zend_virtual_cwd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_virtual_cwd.c b/Zend/zend_virtual_cwd.c index 978b5dc552..c38c3bea84 100644 --- a/Zend/zend_virtual_cwd.c +++ b/Zend/zend_virtual_cwd.c @@ -261,7 +261,7 @@ CWD_API int php_sys_readlink(const char *link, char *target, size_t target_len){ } dwRet = pGetFinalPathNameByHandle(hFile, target, MAXPATHLEN, VOLUME_NAME_DOS); - if(dwRet >= MAXPATHLEN) { + if(dwRet >= MAXPATHLEN || dwRet == 0) { return -1; } |