backported patch for bug #69472

weltling · weltling · commit 3cd3881574b5 · 2015-04-28T15:31:47.000+02:00
diff --git 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
@@ -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;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,7 @@ CWD_API int php_sys_readlink(const char link, char target, size_t target_len){`
`251`	`251`	`}`
`252`	`252`
`253`	`253`	`dwRet = pGetFinalPathNameByHandle(hFile, target, MAXPATHLEN, VOLUME_NAME_DOS);`
`254`		`- if(dwRet >= MAXPATHLEN) {`
	`254`	`+ if(dwRet >= MAXPATHLEN \|\| dwRet == 0) {`
`255`	`255`	`return -1;`
`256`	`256`	`}`
`257`	`257`