Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[2019-06] [utils] Don't use MAP_32BIT on Apple platforms, fixes crash with XCode 11 beta6 #16481

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
akoeplinger merged 1 commit into from
Aug 26, 2019
Merged

[2019-06] [utils] Don't use MAP_32BIT on Apple platforms, fixes crash with XCode 11 beta6 #16481

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions mono/utils/mono-mmap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,11 @@
#define MAP_ANONYMOUS MAP_ANON
#endif

#if !defined(__APPLE__) // returning virtual addresses <4G requires entitlement on Apple platforms, do not use it
#ifndef MAP_32BIT
#define MAP_32BIT 0
#endif
#endif

typedef struct {
int size;
Expand Down Expand Up @@ -277,8 +279,10 @@ mono_valloc (void *addr, size_t length, int flags, MonoMemAccountType type)
/* translate the flags */
if (flags & MONO_MMAP_FIXED)
mflags |= MAP_FIXED;
#if !defined(__APPLE__) // returning virtual addresses <4G requires entitlement on Apple platforms, do not use it
if (flags & MONO_MMAP_32BIT)
mflags |= MAP_32BIT;
#endif

#ifdef HOST_WASM
if (length == 0)
Expand Down Expand Up @@ -374,8 +378,10 @@ mono_file_map (size_t length, int flags, int fd, guint64 offset, void **ret_hand
mflags |= MAP_SHARED;
if (flags & MONO_MMAP_FIXED)
mflags |= MAP_FIXED;
#if !defined(__APPLE__) // returning virtual addresses <4G requires entitlement on Apple platforms, do not use it
if (flags & MONO_MMAP_32BIT)
mflags |= MAP_32BIT;
#endif

#ifdef HOST_WASM
if (length == 0)
Expand Down