From 4326bda2c70d8973cded30c07ce9d8746c2c67dd Mon Sep 17 00:00:00 2001 From: daan Date: Tue, 2 Jul 2019 12:53:53 -0700 Subject: [PATCH] Fix main heap cookie on macOS --- src/init.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/init.c b/src/init.c index 5a750506..f1756d96 100644 --- a/src/init.c +++ b/src/init.c @@ -364,7 +364,9 @@ void mi_process_init(void) mi_attr_noexcept { _mi_heap_main.thread_id = _mi_thread_id(); _mi_verbose_message("process init: 0x%zx\n", _mi_heap_main.thread_id); uintptr_t random = _mi_random_init(_mi_heap_main.thread_id) ^ (uintptr_t)h; + #ifndef __APPLE _mi_heap_main.cookie = (uintptr_t)&_mi_heap_main ^ random; + #endif _mi_heap_main.random = _mi_random_shuffle(random); #if (MI_DEBUG) _mi_verbose_message("debug level : %d\n", MI_DEBUG);