Skip to content
Merged
Changes from all commits
Commits
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
Fix UMThunkMarshInfo delete
There was a forgotten call to c++ delete that should have been converted
to LoaderHeap::BackoutMem in a code path invoked only if two threads
raced for allocating the UMThunkMarshInfo and the one that lost the race
needed to delete it.
  • Loading branch information
janvorli committed Jul 13, 2021
commit 5ba635cddad00e655a94f5df903999ad286126c8
2 changes: 1 addition & 1 deletion src/coreclr/vm/comdelegate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1263,7 +1263,7 @@ LPVOID COMDelegate::ConvertToCallback(OBJECTREF pDelegateObj)
pUMThunkMarshInfo,
NULL ) != NULL)
{
delete pUMThunkMarshInfo;
pMT->GetLoaderAllocator()->GetStubHeap()->BackoutMem(pUMThunkMarshInfo, sizeof(UMThunkMarshInfo));
pUMThunkMarshInfo = pClass->m_pUMThunkMarshInfo;
}
}
Expand Down