Revert "Fix #79806: realpath() erroneously resolves link to link"

This reverts commit d5b59b4.
php · Jul 27, 2020 · 1aeff52 · 1aeff52
1 parent d5b59b4
commit 1aeff52
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/NEWS b/NEWS
@@ -5,7 +5,6 @@ PHP                                                                        NEWS
 - Core:
   . Fixed bug #79884 (PHP_CONFIG_FILE_PATH is meaningless). (cmb)
   . Fixed bug #77932 (File extensions are case-sensitive). (cmb)
-  . Fixed bug #79806 (realpath() erroneously resolves link to link). (cmb)
 
 ?? ??? ????, PHP 7.3.21
 

diff --git a/Zend/zend_virtual_cwd.c b/Zend/zend_virtual_cwd.c
@@ -845,7 +845,6 @@ static size_t tsrm_realpath_r(char *path, size_t start, size_t len, int *ll, tim
 		}
 
 #ifdef ZEND_WIN32
-retry_reparse_point:
 		if (save) {
 			pathw = php_win32_ioutil_any_to_w(path);
 			if (!pathw) {
@@ -868,7 +867,7 @@ static size_t tsrm_realpath_r(char *path, size_t start, size_t len, int *ll, tim
 		tmp = do_alloca(len+1, use_heap);
 		memcpy(tmp, path, len+1);
 
-retry_reparse_tag_cloud:
+retry:
 		if(save &&
 				!(IS_UNC_PATH(path, len) && len >= 3 && path[2] != '?') &&
                                (dataw.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)
@@ -929,7 +928,7 @@ static size_t tsrm_realpath_r(char *path, size_t start, size_t len, int *ll, tim
 					dataw.dwFileAttributes = fileInformation.dwFileAttributes;
 					CloseHandle(hLink);
 					(*ll)--;
-					goto retry_reparse_tag_cloud;
+					goto retry;
 				}
 				free_alloca(tmp, use_heap);
 				CloseHandle(hLink);
@@ -1076,15 +1075,6 @@ static size_t tsrm_realpath_r(char *path, size_t start, size_t len, int *ll, tim
 			free_alloca(pbuffer, use_heap_large);
 			free(substitutename);
 
-			{
-				DWORD attrs = GetFileAttributesA(path);
-				if (!isVolume && (attrs & FILE_ATTRIBUTE_REPARSE_POINT)) {
-					free_alloca(tmp, use_heap);
-					FREE_PATHW()
-					goto retry_reparse_point;
-				}
-			}
-
 			if(isabsolute == 1) {
 				if (!((j == 3) && (path[1] == ':') && (path[2] == '\\'))) {
 					/* use_realpath is 0 in the call below coz path is absolute*/

diff --git a/ext/standard/tests/file/realpath_basic4.phpt b/ext/standard/tests/file/realpath_basic4.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test realpath() with relative paths
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+    die('skip no symlinks on Windows');
+}
+?>
 --FILE--
 <?php
 $file_path = dirname(__FILE__);