Fix stack overflow createdump triggering on Windows (#40869)

dotnet · Aug 15, 2020 · 1d6fc68 · 1d6fc68
1 parent 8907340
commit 1d6fc68
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/coreclr/src/vm/eepolicy.cpp b/src/coreclr/src/vm/eepolicy.cpp
@@ -583,7 +583,9 @@ void DisplayStackOverflowException()
 DWORD LogStackOverflowStackTraceThread(void* arg)
 {
     LogCallstackForLogWorker((Thread*)arg);
-
+#ifdef HOST_WINDOWS
+    CreateCrashDumpIfEnabled();
+#endif
     return 0;
 }
 

diff --git a/src/coreclr/src/vm/excep.cpp b/src/coreclr/src/vm/excep.cpp
@@ -4119,10 +4119,11 @@ LaunchCreateDump(LPCWSTR lpCommandLine)
 void
 CreateCrashDumpIfEnabled()
 {
-    // If enabled, launch the create minidump utility and wait until it completes
-    if (g_createDumpCommandLine != nullptr)
+    // If enabled, launch the create minidump utility and wait until it completes. Only launch createdump once for this process.
+    LPCWSTR createDumpCommandLine = InterlockedExchangeT<LPCWSTR>(&g_createDumpCommandLine, nullptr);
+    if (createDumpCommandLine != nullptr)
     {
-        LaunchCreateDump(g_createDumpCommandLine);
+        LaunchCreateDump(createDumpCommandLine);
     }
 }