backport 51e1da6ea1e663908302e162ced1b7a8cb5aee05 into 7.0

diff --git a/Zend/zend_virtual_cwd.c b/Zend/zend_virtual_cwd.c
index ca19802ff7233b5ca0c09a5aca99faa9e6133ca4..8e090780202f95a781cf6762bc5e0c5d74de7f23 100644 (file)
--- a/Zend/zend_virtual_cwd.c
+++ b/Zend/zend_virtual_cwd.c
@@ -899,9 +899,12 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i
                        int bufindex = 0, isabsolute = 0;
                        wchar_t * reparsetarget;
                        BOOL isVolume = FALSE;
+#if VIRTUAL_CWD_DEBUG
                        char printname[MAX_PATH];
+                       int printname_len;
+#endif
                        char substitutename[MAX_PATH];
-                       int printname_len, substitutename_len;
+                       int substitutename_len;
                        int substitutename_off = 0;
 
                        if(++(*ll) > LINK_MAX) {
@@ -928,6 +931,7 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i
 
                        if(pbuffer->ReparseTag == IO_REPARSE_TAG_SYMLINK) {
                                reparsetarget = pbuffer->SymbolicLinkReparseBuffer.ReparseTarget;
+#if VIRTUAL_CWD_DEBUG
                                printname_len = pbuffer->MountPointReparseBuffer.PrintNameLength / sizeof(WCHAR);
                                isabsolute = (pbuffer->SymbolicLinkReparseBuffer.Flags == 0) ? 1 : 0;
                                if (!WideCharToMultiByte(CP_THREAD_ACP, 0,
@@ -940,6 +944,7 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i
                                };
                                printname_len = pbuffer->MountPointReparseBuffer.PrintNameLength / sizeof(WCHAR);
                                printname[printname_len] = 0;
+#endif
 
                                substitutename_len = pbuffer->MountPointReparseBuffer.SubstituteNameLength / sizeof(WCHAR);
                                if (!WideCharToMultiByte(CP_THREAD_ACP, 0,
@@ -955,6 +960,7 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i
                        else if(pbuffer->ReparseTag == IO_REPARSE_TAG_MOUNT_POINT) {
                                isabsolute = 1;
                                reparsetarget = pbuffer->MountPointReparseBuffer.ReparseTarget;
+#if VIRTUAL_CWD_DEBUG
                                printname_len = pbuffer->MountPointReparseBuffer.PrintNameLength / sizeof(WCHAR);
                                if (!WideCharToMultiByte(CP_THREAD_ACP, 0,
                                        reparsetarget + pbuffer->MountPointReparseBuffer.PrintNameOffset  / sizeof(WCHAR),
@@ -965,6 +971,7 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i
                                        return -1;
                                };
                                printname[pbuffer->MountPointReparseBuffer.PrintNameLength / sizeof(WCHAR)] = 0;
+#endif
 
                                substitutename_len = pbuffer->MountPointReparseBuffer.SubstituteNameLength / sizeof(WCHAR);
                                if (!WideCharToMultiByte(CP_THREAD_ACP, 0,