Fix DAC stack overflow in GetUsefulGlobals API (#105962)

github-actions[bot] · Mike McLaughlin · web-flow · commit 0d79e6de8dbc · 2024-08-05T11:10:48.000-07:00
Co-authored-by: Mike McLaughlin &lt;mikem@microsoft.com&gt;
diff --git a/src/coreclr/debug/daccess/request.cpp b/src/coreclr/debug/daccess/request.cpp
@@ -2408,7 +2408,7 @@ ClrDataAccess::GetMethodTableForEEClass(CLRDATA_ADDRESS eeClassReallyCanonMT, CL
     }
     else
     {
-        hr = GetMethodTableForEEClassImpl (eeClassReallyCanonMT, value);
+        hr = GetMethodTableForEEClassImpl(eeClassReallyCanonMT, value);
     }
     SOSDacLeave();
     return hr;
@@ -3535,7 +3535,7 @@ ClrDataAccess::GetUsefulGlobals(struct DacpUsefulGlobalsData* globalsData)
         hr = m_cdacSos->GetUsefulGlobals(globalsData);
         if (FAILED(hr))
         {
-            hr = GetUsefulGlobals(globalsData);
+            hr = GetUsefulGlobalsImpl(globalsData);
         }
 #ifdef _DEBUG
         else
@@ -3554,7 +3554,7 @@ ClrDataAccess::GetUsefulGlobals(struct DacpUsefulGlobalsData* globalsData)
     }
     else
     {
-        hr = GetUsefulGlobals(globalsData);;
+        hr = GetUsefulGlobalsImpl(globalsData);;
     }
 
     SOSDacLeave();

Original file line number	Diff line number	Diff line change
`@@ -2408,7 +2408,7 @@ ClrDataAccess::GetMethodTableForEEClass(CLRDATA_ADDRESS eeClassReallyCanonMT, CL`
`2408`	`2408`	`}`
`2409`	`2409`	`else`
`2410`	`2410`	`{`
`2411`		`- hr = GetMethodTableForEEClassImpl (eeClassReallyCanonMT, value);`
	`2411`	`+ hr = GetMethodTableForEEClassImpl(eeClassReallyCanonMT, value);`
`2412`	`2412`	`}`
`2413`	`2413`	`SOSDacLeave();`
`2414`	`2414`	`return hr;`
`@@ -3535,7 +3535,7 @@ ClrDataAccess::GetUsefulGlobals(struct DacpUsefulGlobalsData* globalsData)`
`3535`	`3535`	`hr = m_cdacSos->GetUsefulGlobals(globalsData);`
`3536`	`3536`	`if (FAILED(hr))`
`3537`	`3537`	`{`
`3538`		`- hr = GetUsefulGlobals(globalsData);`
	`3538`	`+ hr = GetUsefulGlobalsImpl(globalsData);`
`3539`	`3539`	`}`
`3540`	`3540`	`#ifdef _DEBUG`
`3541`	`3541`	`else`
`@@ -3554,7 +3554,7 @@ ClrDataAccess::GetUsefulGlobals(struct DacpUsefulGlobalsData* globalsData)`
`3554`	`3554`	`}`
`3555`	`3555`	`else`
`3556`	`3556`	`{`
`3557`		`- hr = GetUsefulGlobals(globalsData);;`
	`3557`	`+ hr = GetUsefulGlobalsImpl(globalsData);;`
`3558`	`3558`	`}`
`3559`	`3559`
`3560`	`3560`	`SOSDacLeave();`