diff options
| author | Anatol Belski <ab@php.net> | 2015-04-28 15:31:47 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-04-28 15:31:47 +0200 |
| commit | 3cd3881574b5b3c4e730d8be5d757a8bc8f374fa (patch) | |
| tree | a5de342a1cf861ea417635fd8918aad6584e0077 | |
| parent | 1c7a902d8adc546bf81b0d9cdd42fcce139e18c3 (diff) | |
| download | php-git-3cd3881574b5b3c4e730d8be5d757a8bc8f374fa.tar.gz | |
backported patch for bug #69472
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | TSRM/tsrm_virtual_cwd.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -13,6 +13,8 @@ PHP NEWS . Fixed bug #68652 (segmentation fault in destructor). (Dmitry) . Fixed bug #69419 (Returning compatible sub generator produces a warning). (Nikita) + . Fixed bug #69472 (php_sys_readlink ignores misc errors from + GetFinalPathNameByHandleA). (Jan Starke) - ODBC: . Fixed bug #69474 (ODBC: Query with same field name from two tables returns diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c index 2d97844a4a..ba92711f89 100644 --- a/TSRM/tsrm_virtual_cwd.c +++ b/TSRM/tsrm_virtual_cwd.c @@ -251,7 +251,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; } |