Skip to content

Commit 0eec0be

Browse files
authored
Modify ClrDataAccess::StartEnumMethodInstancesByAddress HResult on failure (#119021)
* ClrDataAccess::StartEnumMethodInstancesByAddress previously returned a S_OK code on failure. This change ensures a failure code is returned on failure.
1 parent 0e663a6 commit 0eec0be

2 files changed

Lines changed: 2 additions & 3 deletions

File tree

src/coreclr/debug/daccess/daccess.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4183,6 +4183,7 @@ ClrDataAccess::StartEnumMethodInstancesByAddress(
41834183
methodDesc = ExecutionManager::GetCodeMethodDesc(taddr);
41844184
if (!methodDesc)
41854185
{
4186+
status = S_FALSE;
41864187
goto Exit;
41874188
}
41884189

src/native/managed/cdac/mscordaccore_universal/Legacy/SOSDacImpl.IXCLRDataProcess.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -331,10 +331,8 @@ private bool HasMethodInstantiation(MethodDescHandle md)
331331

332332
int IXCLRDataProcess.StartEnumMethodInstancesByAddress(ClrDataAddress address, /*IXCLRDataAppDomain*/ void* appDomain, ulong* handle)
333333
{
334-
int hr = HResults.S_OK;
335-
334+
int hr = HResults.S_FALSE;
336335
*handle = 0;
337-
hr = HResults.S_FALSE;
338336

339337
ulong handleLocal = default;
340338
#if DEBUG

0 commit comments

Comments
 (0)