From: Sergey Andreenko <seandree@microsoft.com>
Date: Thu, 1 Jun 2017 21:24:39 +0000 (-0700)
Subject: Fix 11991 (dotnet/coreclr#12013)
X-Git-Tag: submit/tizen/20210909.063632~11030^2~6925^2~577
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=078c6ef30cd1310fb2da1f746120081bb550162e;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

Fix 11991 (dotnet/coreclr#12013)

Fix the case when the path doesn't have any '\'.
Fix clean_up.

Commit migrated from https://github.com/dotnet/coreclr/commit/40a6f20696efecf3c5faf3210f369dd3f9d8fdb2
---

diff --git a/src/coreclr/src/ToolBox/superpmi/mcs/verbmerge.cpp b/src/coreclr/src/ToolBox/superpmi/mcs/verbmerge.cpp
index eeded27..029b3b7 100644
--- a/src/coreclr/src/ToolBox/superpmi/mcs/verbmerge.cpp
+++ b/src/coreclr/src/ToolBox/superpmi/mcs/verbmerge.cpp
@@ -53,6 +53,8 @@ int verbMerge::AppendFile(HANDLE hFileOut, LPCWSTR fileName, unsigned char* buff
                                  FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL);
     if (hFileIn == INVALID_HANDLE_VALUE)
     {
+        // If you use a relative path, you can get GetLastError()==3, if the absolute path is longer
+        // than MAX_PATH.
         LogError("Failed to open input file '%s'. GetLastError()=%u", fileNameAsChar, GetLastError());
         return -1;
     }
@@ -312,7 +314,7 @@ int verbMerge::AppendAllInDir(HANDLE              hFileOut,
         const _WIN32_FIND_DATAW& findData     = fileArray[i];
         LPWSTR                   fileFullPath = MergePathStrings(dir, findData.cFileName);
 
-        if (wcslen(fileFullPath) > MAX_PATH) // It is too long path, use \\?\ to access it.
+        if (wcslen(fileFullPath) > MAX_PATH) // This path is too long, use \\?\ to access it.
         {
             assert(wcscmp(dir, W(".")) != 0 && "can't access the relative path with UNC");
             LPWSTR newBuffer = new WCHAR[wcslen(fileFullPath) + 30];
@@ -449,7 +451,7 @@ int verbMerge::DoWork(const char* nameOfOutputFile, const char* pattern, bool re
         // The user may have passed a relative path without a slash, or the current directory.
         // If there is a wildcard, we use it as the file pattern. If there isn't, we assume it's a relative directory
         // name and use it as a directory, with "*" as the file pattern.
-        LPCWSTR wildcard = wcschr(dir, '*');
+        LPCWSTR wildcard = wcschr(patternAsWchar, '*');
         if (wildcard == NULL)
         {
             file = W("*");
@@ -504,7 +506,7 @@ int verbMerge::DoWork(const char* nameOfOutputFile, const char* pattern, bool re
 
 CLEAN_UP:
 
-    free((void*)dir);
+    delete[] patternAsWchar;
     delete[] buffer;
 
     if (CloseHandle(hFileOut) == 0)
@@ -522,6 +524,7 @@ CLEAN_UP:
             LogError("Failed to delete file after MCS /merge failed. GetLastError()=%u", GetLastError());
         }
     }
+    delete[] nameOfOutputFileAsWchar;
 
     return result;
 }