Merge branch 'PHP-5.5' into PHP-5.6

weltling · weltling · commit 4af9ca544edb · 2015-04-28T15:32:22.000+02:00
* PHP-5.5:
  backported patch for bug #69472
diff --git 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;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ CWD_API int php_sys_readlink(const char link, char target, size_t target_len){`
`261`	`261`	`}`
`262`	`262`
`263`	`263`	`dwRet = pGetFinalPathNameByHandle(hFile, target, MAXPATHLEN, VOLUME_NAME_DOS);`
`264`		`- if(dwRet >= MAXPATHLEN) {`
	`264`	`+ if(dwRet >= MAXPATHLEN \|\| dwRet == 0) {`
`265`	`265`	`return -1;`
`266`	`266`	`}`
`267`	`267`