Skip to content
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

Jump to bottom

[release/7.0] Fix reserving executable memory as per allocation type in ClrVirtualAllocWithinRange() #83958

Merged
merged 4 commits into from
Apr 10, 2023
Merged

[release/7.0] Fix reserving executable memory as per allocation type in ClrVirtualAllocWithinRange() #83958

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b565fa4
Fix reserving executable memory as per allocation type in ClrVirtualA…
k15tfu Mar 21, 2023
60c3813
Revert NuGet.config unexpected change.
carlossanlop Apr 10, 2023
13cce2c
Reverting changes to Versions.Details.xml and Versions.props
carlossanlop Apr 10, 2023
4907f43
Merge branch 'release/7.0-staging' into backport/pr-83819-to-release/7.0
carlossanlop Apr 10, 2023
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
4 changes: 2 additions & 2 deletions src/coreclr/utilcode/util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ BYTE * ClrVirtualAllocWithinRange(const BYTE *pMinAddr,
{
NOTHROW;
PRECONDITION(dwSize != 0);
PRECONDITION(flAllocationType == MEM_RESERVE);
PRECONDITION(flAllocationType == MEM_RESERVE); // ORed with MEM_RESERVE_EXECUTABLE on Unix
AaronRobinsonMSFT marked this conversation as resolved.
Show resolved Hide resolved
}
CONTRACTL_END;

Expand Down Expand Up @@ -449,7 +449,7 @@ BYTE * ClrVirtualAllocWithinRange(const BYTE *pMinAddr,
(mbInfo.RegionSize >= (SIZE_T) dwSize || mbInfo.RegionSize == 0))
{
// Try reserving the memory using VirtualAlloc now
pResult = (BYTE*)ClrVirtualAlloc(tryAddr, dwSize, MEM_RESERVE, flProtect);
pResult = (BYTE*)ClrVirtualAlloc(tryAddr, dwSize, flAllocationType, flProtect);

// Normally this will be successful
//
Expand Down