Misc fixes

Issue: dotnet#673
mikem8361 · Dec 10, 2019 · 630cab3 · 630cab3
1 parent 125ea40
commit 630cab3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/src/SOS/Strike/hostcoreclr.cpp b/src/SOS/Strike/hostcoreclr.cpp
@@ -826,17 +826,21 @@ void InitializeSymbolStoreFromSymPath()
 {
     if (g_SOSNetCoreCallbacks.InitializeSymbolStoreDelegate != nullptr)
     {
-        ArrayHolder<char> symbolPath = new char[MAX_LONGPATH];
-        if (SUCCEEDED(g_ExtSymbols->GetSymbolPath(symbolPath, MAX_LONGPATH, nullptr)))
+        ULONG cchLength = 0;
+        if (SUCCEEDED(g_ExtSymbols->GetSymbolPath(nullptr, 0, &cchLength)))
         {
-            if (strlen(symbolPath) > 0)
-            {   
-                if (!g_SOSNetCoreCallbacks.InitializeSymbolStoreDelegate(false, false, false, GetTempDirectory(), nullptr, nullptr, nullptr, symbolPath))
+            ArrayHolder<char> symbolPath = new char[cchLength];
+            if (SUCCEEDED(g_ExtSymbols->GetSymbolPath(symbolPath, cchLength, nullptr)))
+            {
+                if (strlen(symbolPath) > 0)
                 {
-                    ExtErr("Windows symbol path parsing FAILED\n");
-                    return;
+                    if (!g_SOSNetCoreCallbacks.InitializeSymbolStoreDelegate(false, false, false, GetTempDirectory(), nullptr, nullptr, nullptr, symbolPath))
+                    {
+                        ExtErr("Windows symbol path parsing FAILED\n");
+                        return;
+                    }
+                    g_symbolStoreInitialized = true;
                 }
-                g_symbolStoreInitialized = true;
             }
         }
     }

diff --git a/src/inc/palclr.h b/src/inc/palclr.h
@@ -613,10 +613,10 @@
 #endif
 
 #if !defined(MAX_LONGPATH)
-#define MAX_LONGPATH   260 /* max. length of full pathname */
+#define MAX_LONGPATH    1024        /* max. length of full pathname */
 #endif
 #if !defined(MAX_PATH_FNAME)
-#define MAX_PATH_FNAME   MAX_PATH /* max. length of full pathname */
+#define MAX_PATH_FNAME  MAX_PATH    /* max. length of full pathname */
 #endif
 
 #define __clr_reserved __reserved