From b8dc09e3d2adde248daabe1303b161c714bff298 Mon Sep 17 00:00:00 2001
From: daanx <daan@effp.org>
Date: Sun, 17 Nov 2024 22:56:26 -0800
Subject: [PATCH] fix asan with MI_GUARDED

---
 src/alloc-aligned.c | 3 +++
 src/alloc.c         | 5 +++--
 src/os.c            | 2 ++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/alloc-aligned.c b/src/alloc-aligned.c
index 6aee38c3..b4da4ded 100644
--- a/src/alloc-aligned.c
+++ b/src/alloc-aligned.c
@@ -123,6 +123,9 @@ static mi_decl_noinline void* mi_heap_malloc_zero_aligned_at_overalloc(mi_heap_t
 
   if (p != aligned_p) {
     mi_track_align(p,aligned_p,adjust,mi_usable_size(aligned_p));
+    #if MI_GUARDED
+    mi_track_mem_defined(p, sizeof(mi_block_t));
+    #endif
   }
   return aligned_p;
 }
diff --git a/src/alloc.c b/src/alloc.c
index bc4f2aa5..a093f108 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -640,8 +640,9 @@ static void* mi_block_ptr_set_guarded(mi_block_t* block, size_t obj_size) {
     // give up to place it right in front of the guard page if the offset is too large for unalignment
     offset = MI_BLOCK_ALIGNMENT_MAX;
   }
-  void* p = (uint8_t*)block + offset;
+  void* p = (uint8_t*)block + offset;  
   mi_track_align(block, p, offset, obj_size);
+  mi_track_mem_defined(block, sizeof(mi_block_t));
   return p;
 }
 
@@ -661,7 +662,7 @@ mi_decl_restrict void* _mi_heap_malloc_guarded(mi_heap_t* heap, size_t size, boo
   void* const p   = mi_block_ptr_set_guarded(block, obj_size);
 
   // stats
-  mi_track_malloc(p, size, zero);
+  mi_track_malloc(p, size, zero);  
   if (p != NULL) {
     if (!mi_heap_is_initialized(heap)) { heap = mi_prim_get_default_heap(); }
     #if MI_STAT>1
diff --git a/src/os.c b/src/os.c
index 62c8c934..a7130b90 100644
--- a/src/os.c
+++ b/src/os.c
@@ -273,7 +273,9 @@ static void* mi_os_prim_alloc_aligned(size_t size, size_t alignment, bool commit
   }
   else {
     // if not aligned, free it, overallocate, and unmap around it
+    #if !MI_TRACK_ASAN
     _mi_warning_message("unable to allocate aligned OS memory directly, fall back to over-allocation (size: 0x%zx bytes, address: %p, alignment: 0x%zx, commit: %d)\n", size, p, alignment, commit);
+    #endif
     mi_os_prim_free(p, size, commit, stats);
     if (size >= (SIZE_MAX - alignment)) return NULL; // overflow
     const size_t over_size = size + alignment;