From 524cd3106f09e42d574ebbb87f64affe105ff5c8 Mon Sep 17 00:00:00 2001
From: gilbertjgonzales <51271583+gilbertjgonzales@users.noreply.github.com>
Date: Mon, 13 Apr 2020 01:40:18 -0700
Subject: [PATCH] Fixed bug #79470: PHP incompatible with 3rd party file system
 on demand

Update tsrm_realpath_r() to handle unknown reparse tags with
default behavior that matches how
IO_REPARSE_TAG_DEDUP, IO_REPARSE_TAG_CLOUD,
IO_REPARSE_TAG_ONEDRIVE were handled previously.
In general the default behavior for 3rd party files systems
with non public reparse tags will be using default behavior
instead of having to be added explicitly to PHP in order to
be supported.

This change keeps existing behavior and expands the behavior to
future or non-public "Fetch On Demand" file systems.
---
 Zend/zend_virtual_cwd.c | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/Zend/zend_virtual_cwd.c b/Zend/zend_virtual_cwd.c
index c523f40dc952d..f3b284f1fd0a7 100644
--- a/Zend/zend_virtual_cwd.c
+++ b/Zend/zend_virtual_cwd.c
@@ -38,10 +38,6 @@
 #  define IO_REPARSE_TAG_SYMLINK 0xA000000C
 # endif
 
-# ifndef IO_REPARSE_TAG_DEDUP
-#  define IO_REPARSE_TAG_DEDUP   0x80000013
-# endif
-
 # ifndef IO_REPARSE_TAG_CLOUD
 #  define IO_REPARSE_TAG_CLOUD    (0x9000001AL)
 # endif
@@ -51,10 +47,6 @@
 #define IO_REPARSE_TAG_CLOUD_MASK (0x0000F000L)
 #endif
 
-#ifndef IO_REPARSE_TAG_ONEDRIVE
-#define IO_REPARSE_TAG_ONEDRIVE   (0x80000021L)
-#endif
-
 # ifndef VOLUME_NAME_NT
 #  define VOLUME_NAME_NT 0x2
 # endif
@@ -998,11 +990,7 @@ static size_t tsrm_realpath_r(char *path, size_t start, size_t len, int *ll, tim
 					FREE_PATHW()
 					return (size_t)-1;
 				}
-			}
-			else if (pbuffer->ReparseTag == IO_REPARSE_TAG_DEDUP ||
-					/* Starting with 1709. */
-					(pbuffer->ReparseTag & ~IO_REPARSE_TAG_CLOUD_MASK) == IO_REPARSE_TAG_CLOUD ||
-					IO_REPARSE_TAG_ONEDRIVE == pbuffer->ReparseTag) {
+			} else {
 				isabsolute = 1;
 				substitutename = malloc((len + 1) * sizeof(char));
 				if (!substitutename) {
@@ -1013,12 +1001,6 @@ static size_t tsrm_realpath_r(char *path, size_t start, size_t len, int *ll, tim
 				}
 				memcpy(substitutename, path, len + 1);
 				substitutename_len = len;
-			} else {
-				/* XXX this might be not the end, restart handling with REPARSE_GUID_DATA_BUFFER should be implemented. */
-				free_alloca(pbuffer, use_heap_large);
-				free_alloca(tmp, use_heap);
-				FREE_PATHW()
-				return (size_t)-1;
 			}
 
 			if(isabsolute && substitutename_len > 4) {