summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--TSRM/tsrm_virtual_cwd.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index b0e9007f8e..aa414fb8e0 100644
--- a/NEWS
+++ b/NEWS
@@ -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;
}