Fix dump generation segfault in DAC (dotnet#58530)

Issue: dotnet#58525
fnerdman · Sep 2, 2021 · a67d568 · a67d568
1 parent 441271c
commit a67d568
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/coreclr/vm/excep.cpp b/src/coreclr/vm/excep.cpp
@@ -11518,8 +11518,9 @@ VOID ThrowBadFormatWorker(UINT resID, LPCWSTR imageName DEBUGARG(__in_z const ch
         msgStr += W(")");
     }
 #endif
-
     ThrowHR(COR_E_BADIMAGEFORMAT, msgStr);
+#else // DACCESS_COMPILE
+    ThrowHR(COR_E_BADIMAGEFORMAT);
 #endif // #ifndef DACCESS_COMPILE
 }
 

diff --git a/src/coreclr/vm/exceptmacros.h b/src/coreclr/vm/exceptmacros.h
@@ -508,8 +508,12 @@ template <typename T>
 NOINLINE
 VOID ThrowBadFormatWorkerT(UINT resID, T * pImgObj DEBUGARG(__in_z const char *cond))
 {
+#ifdef DACCESS_COMPILE
+    ThrowBadFormatWorker(resID, nullptr DEBUGARG(cond));
+#else
     LPCWSTR tmpStr = GetPathForErrorMessagesT(pImgObj);
     ThrowBadFormatWorker(resID, tmpStr DEBUGARG(cond));
+#endif
 }