Skip to content

[release/7.0] Fix W^X flag for setting ITypeInfo #75046

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
carlossanlop merged 2 commits into from
Sep 6, 2022
Merged

[release/7.0] Fix W^X flag for setting ITypeInfo #75046

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b65092
Fix W^X flag for setting ITypeInfo
AaronRobinsonMSFT Sep 3, 2022
d3d5505
Grab address from the holder.
AaronRobinsonMSFT Sep 3, 2022
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
Prev Previous commit
Grab address from the holder.
  • Loading branch information
@AaronRobinsonMSFT
AaronRobinsonMSFT committed Sep 3, 2022
commit d3d550546fd202f11064dd19553b2888e30eab1d
2 changes: 1 addition & 1 deletion src/coreclr/vm/comcallablewrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3852,7 +3852,7 @@ void ComMethodTable::SetITypeInfo(ITypeInfo *pNew)
CONTRACTL_END;

ExecutableWriterHolder<ComMethodTable> comMTWriterHolder(this, sizeof(ComMethodTable));
if (InterlockedCompareExchangeT(&m_pITypeInfo, pNew, NULL) == NULL)
if (InterlockedCompareExchangeT(&comMTWriterHolder.GetRW()->m_pITypeInfo, pNew, NULL) == NULL)
{
SafeAddRef(pNew);
}
Expand Down