Skip to content

Add NULL checks to GetClassWithPossibleAV #104128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkotas merged 3 commits into from
Jun 28, 2024
Merged

Add NULL checks to GetClassWithPossibleAV #104128

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b885fd
Add NULL checks to GetClassWithPossibleAV
Jun 27, 2024
09e50f5
Fix build break; linux_musl-x64 defines NULL as std::nullptr_t
Jun 27, 2024
5f6dd99
Apply suggestions from code review
jkotas Jun 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion src/coreclr/vm/methodtable.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,12 @@ FORCEINLINE PTR_EEClass MethodTable::GetClassWithPossibleAV()
LIMITED_METHOD_DAC_CONTRACT;

TADDR addr = m_pCanonMT;

#ifdef DACCESS_COMPILE
if (addr == (TADDR)NULL)
{
DacError(E_UNEXPECTED);
}
#endif
LowBits lowBits = union_getLowBits(addr);
if (lowBits == UNION_EECLASS)
{
Expand All @@ -39,6 +44,12 @@ FORCEINLINE PTR_EEClass MethodTable::GetClassWithPossibleAV()
{
// pointer to canonical MethodTable.
TADDR canonicalMethodTable = union_getPointer(addr);
#ifdef DACCESS_COMPILE
if (canonicalMethodTable == (TADDR)NULL)
{
DacError(E_UNEXPECTED);
}
#endif
// a canonical method table always points at its EEClass, and m_pEEClass has no mask bit, so just return it
return PTR_MethodTable(canonicalMethodTable)->m_pEEClass;
}
Expand Down