Skip to content

Validate IntPtr and ByRef field overlap #65246

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
AaronRobinsonMSFT merged 9 commits into from
Feb 15, 2022
Merged

Validate IntPtr and ByRef field overlap #65246

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
60a1570
Validate IntPtr and byref field overlap
AaronRobinsonMSFT Feb 12, 2022
0560184
Add tests
AaronRobinsonMSFT Feb 12, 2022
ac6db0f
Remove local test logic.
AaronRobinsonMSFT Feb 12, 2022
51d8c24
Simplify the call scenario for ByRefLike value types.
AaronRobinsonMSFT Feb 12, 2022
1b5d351
Merge remote-tracking branch 'upstream/main' into overlap_byref_and_prim
AaronRobinsonMSFT Feb 12, 2022
9615682
Fix loop over buffers.
AaronRobinsonMSFT Feb 13, 2022
701a4bb
Merge remote-tracking branch 'upstream/main' into overlap_byref_and_prim
AaronRobinsonMSFT Feb 14, 2022
4ccb193
Overlapped IntPtr and byref fields should be invalid on mono too.
AaronRobinsonMSFT Feb 14, 2022
14d466d
Limit looking for ref fields to value types
AaronRobinsonMSFT Feb 15, 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
Next Next commit
Fix loop over buffers.
  • Loading branch information
@AaronRobinsonMSFT
AaronRobinsonMSFT committed Feb 13, 2022
commit 9615682136317f3f86a179cf57b49c6e1f242170
4 changes: 2 additions & 2 deletions src/coreclr/vm/methodtablebuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8578,9 +8578,9 @@ MethodTableBuilder::HandleExplicitLayout(
// Look for any orefs or byrefs under this field
BYTE *loc = NULL;
BYTE* currOffset = pFieldLayout + pFD->GetOffset_NoLogging();
for (UINT j = 0; j < fieldSize; ++j)
BYTE* endOffset = currOffset + fieldSize;
for (; currOffset < endOffset; ++currOffset)
{
currOffset += j;
if (*currOffset == oref || *currOffset == byref)
{
loc = currOffset;
Expand Down