Fix dump generation segfault in DAC (#58530)

Mike McLaughlin · web-flow · commit a67d5680186e · 2021-09-02T04:01:01.000Z
Issue: #58525
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
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -11518,8 +11518,9 @@ VOID ThrowBadFormatWorker(UINT resID, LPCWSTR imageName DEBUGARG(__in_z const ch`
`11518`	`11518`	`msgStr += W(")");`
`11519`	`11519`	`}`
`11520`	`11520`	`#endif`
`11521`		`-`
`11522`	`11521`	`ThrowHR(COR_E_BADIMAGEFORMAT, msgStr);`
	`11522`	`+#else // DACCESS_COMPILE`
	`11523`	`+ ThrowHR(COR_E_BADIMAGEFORMAT);`
`11523`	`11524`	`#endif // #ifndef DACCESS_COMPILE`
`11524`	`11525`	`}`
`11525`	`11526`
Original file line number	Diff line number	Diff line change
`@@ -508,8 +508,12 @@ template <typename T>`
`508`	`508`	`NOINLINE`
`509`	`509`	`VOID ThrowBadFormatWorkerT(UINT resID, T * pImgObj DEBUGARG(__in_z const char *cond))`
`510`	`510`	`{`
	`511`	`+#ifdef DACCESS_COMPILE`
	`512`	`+ ThrowBadFormatWorker(resID, nullptr DEBUGARG(cond));`
	`513`	`+#else`
`511`	`514`	`LPCWSTR tmpStr = GetPathForErrorMessagesT(pImgObj);`
`512`	`515`	`ThrowBadFormatWorker(resID, tmpStr DEBUGARG(cond));`
	`516`	`+#endif`
`513`	`517`	`}`
`514`	`518`
`515`	`519`