From 07fa0f7f07a04e8238c63b90b208beebba108399 Mon Sep 17 00:00:00 2001 From: Dong-Heon Jung Date: Tue, 24 Dec 2019 04:11:43 +0900 Subject: [PATCH] Change bIsFree check in DacValidateMethodTable (#1086) Some commands of SOS validate a method table in DacValidateMethodTable. In the function, it checks whether a method table is FreeObjectMethodTable or not with GetClass() value. However, GetClass() should not be NULL. (There is an assert in GetClass()) In this patch, it compares pMT address with g_pFreeObjectMethodTable address only. --- src/coreclr/src/debug/daccess/request.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/coreclr/src/debug/daccess/request.cpp b/src/coreclr/src/debug/daccess/request.cpp index fb556d5..de9790b 100644 --- a/src/coreclr/src/debug/daccess/request.cpp +++ b/src/coreclr/src/debug/daccess/request.cpp @@ -129,15 +129,8 @@ BOOL DacValidateMethodTable(MethodTable *pMT, BOOL &bIsFree) EX_TRY { bIsFree = FALSE; - EEClass *pEEClass = pMT->GetClass(); - if (pEEClass==NULL) + if (HOST_CDADDR(pMT) == HOST_CDADDR(g_pFreeObjectMethodTable)) { - // Okay to have a NULL EEClass if this is a free methodtable - CLRDATA_ADDRESS MethTableAddr = HOST_CDADDR(pMT); - CLRDATA_ADDRESS FreeObjMethTableAddr = HOST_CDADDR(g_pFreeObjectMethodTable); - if (MethTableAddr != FreeObjMethTableAddr) - goto BadMethodTable; - bIsFree = TRUE; } else -- 2.7.4