Loading...
--- libmalloc/libmalloc-283.100.6/src/malloc.c
+++ libmalloc/libmalloc-283.40.1/src/malloc.c
@@ -1008,7 +1008,6 @@
malloc_debug_flags = MALLOC_ABORT_ON_CORRUPTION;
}
#endif
-
/*
* Given that all environment variables start with "Malloc" we optimize by scanning quickly
* first the environment, therefore avoiding repeated calls to getenv().
@@ -1040,32 +1039,19 @@
return;
}
- flag = getenv("MallocGuardEdges");
- if (flag) {
- if (!strcmp(flag, "all")) {
- // "MallocGuardEdges=all" adds guard page(s) for every region.
- // Do not do this on 32-bit platforms because there is insufficient
- // address space. These pages are always protected.
-#if MALLOC_TARGET_64BIT
- malloc_debug_flags |= MALLOC_GUARD_ALL | MALLOC_ADD_GUARD_PAGE_FLAGS;
- malloc_debug_flags &= ~(MALLOC_DONT_PROTECT_PRELUDE|MALLOC_DONT_PROTECT_POSTLUDE);
- malloc_report(ASL_LEVEL_INFO, "adding guard pages to all regions\n");
-#endif // MALLOC_TARGET_64BIT
- } else {
- malloc_debug_flags |= MALLOC_ADD_GUARD_PAGE_FLAGS;
- malloc_debug_flags &= ~MALLOC_GUARD_ALL;
- malloc_report(ASL_LEVEL_INFO, "adding guard pages for large allocator blocks\n");
- if (getenv("MallocDoNotProtectPrelude")) {
- malloc_debug_flags |= MALLOC_DONT_PROTECT_PRELUDE;
- malloc_report(ASL_LEVEL_INFO, "... but not protecting prelude guard page\n");
- }
- if (getenv("MallocDoNotProtectPostlude")) {
- malloc_debug_flags |= MALLOC_DONT_PROTECT_POSTLUDE;
- malloc_report(ASL_LEVEL_INFO, "... but not protecting postlude guard page\n");
- }
- }
- }
-
+ if (getenv("MallocGuardEdges")) {
+ malloc_debug_flags |= MALLOC_ADD_GUARD_PAGES;
+ malloc_report(ASL_LEVEL_INFO, "protecting edges\n");
+ if (getenv("MallocDoNotProtectPrelude")) {
+ malloc_debug_flags |= MALLOC_DONT_PROTECT_PRELUDE;
+ malloc_report(ASL_LEVEL_INFO, "... but not protecting prelude guard page\n");
+ }
+ if (getenv("MallocDoNotProtectPostlude")) {
+ malloc_debug_flags |= MALLOC_DONT_PROTECT_POSTLUDE;
+ malloc_report(ASL_LEVEL_INFO, "... but not protecting postlude guard page\n");
+ }
+ }
+
if (getenv("MallocScribble")) {
malloc_debug_flags |= MALLOC_DO_SCRIBBLE;
malloc_report(ASL_LEVEL_INFO, "enabling scribbling to detect mods to free blocks\n");
@@ -1160,18 +1146,6 @@
} else {
magazine_large_expanded_cache_threshold = value;
malloc_report(ASL_LEVEL_INFO, "Large expanded cache threshold set to %lly\n", magazine_large_expanded_cache_threshold);
- }
- }
-
- flag = getenv("MallocLargeDisableASLR");
- if (flag) {
- uint64_t value = (uint64_t)strtoull(flag, NULL, 0);
- if (value == 0) {
- malloc_report(ASL_LEVEL_INFO, "Enabling ASLR slide on large allocations\n");
- malloc_debug_flags &= ~DISABLE_LARGE_ASLR;
- } else if (value != 0) {
- malloc_report(ASL_LEVEL_INFO, "Disabling ASLR slide on large allocations\n");
- malloc_debug_flags |= DISABLE_LARGE_ASLR;
}
}
@@ -1995,15 +1969,11 @@
malloc_zone_pressure_relief(0, 0);
}
- if ((event & NOTE_MEMORYSTATUS_MSL_STATUS) != 0 && (event & ~NOTE_MEMORYSTATUS_MSL_STATUS) == 0) {
+ if ( ((event & NOTE_MEMORYSTATUS_MSL_STATUS) != 0 && (event & ~NOTE_MEMORYSTATUS_MSL_STATUS) == 0) ||
+ (event & (NOTE_MEMORYSTATUS_PROC_LIMIT_WARN | NOTE_MEMORYSTATUS_PROC_LIMIT_CRITICAL | NOTE_MEMORYSTATUS_PRESSURE_CRITICAL)))
+ {
malloc_register_stack_logger();
}
-
-#if ENABLE_MEMORY_RESOURCE_EXCEPTION_HANDLING
- if (event & (NOTE_MEMORYSTATUS_PROC_LIMIT_WARN | NOTE_MEMORYSTATUS_PROC_LIMIT_CRITICAL | NOTE_MEMORYSTATUS_PRESSURE_CRITICAL)) {
- malloc_register_stack_logger();
- }
-#endif // ENABLE_MEMORY_RESOURCE_EXCEPTION_HANDLING
if (msl.handle_memory_event) {
// Let MSL see the event.