From 0c62893367846bc7dad1cab3bb4d604eb437b918 Mon Sep 17 00:00:00 2001
From: Daan <daanl@outlook.com>
Date: Wed, 21 May 2025 15:28:52 -0700
Subject: [PATCH] fix merge conflict

---
 src/stats.c     | 4 ----
 test/test-api.c | 5 ++++-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/stats.c b/src/stats.c
index d8277427..b1a7779d 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -407,10 +407,6 @@ void _mi_stats_merge_from(mi_stats_t* to, mi_stats_t* from) {
   }
 }
 
-void _mi_stats_merge_thread(mi_tld_t* tld) {
-  _mi_stats_merge_from( &tld->subproc->stats, &tld->stats );
-}
-
 void _mi_stats_done(mi_stats_t* stats) {  // called from `mi_thread_done`
   _mi_stats_merge_from(&_mi_subproc()->stats, stats);
 }
diff --git a/test/test-api.c b/test/test-api.c
index 20d85314..eda8ebf7 100644
--- a/test/test-api.c
+++ b/test/test-api.c
@@ -86,9 +86,12 @@ int main(void) {
   CHECK_BODY("malloc-nomem1") {
     result = (mi_malloc((size_t)PTRDIFF_MAX + (size_t)1) == NULL);
   };
-  CHECK_BODY("malloc-null") {
+  CHECK_BODY("malloc-free-null") {
     mi_free(NULL);
   };
+  CHECK_BODY("malloc-free-invalid-low") {
+    mi_free((void*)(MI_ZU(0x0000000003990080))); // issue #1087
+  };
   CHECK_BODY("calloc-overflow") {
     // use (size_t)&mi_calloc to get some number without triggering compiler warnings
     result = (mi_calloc((size_t)&mi_calloc,SIZE_MAX/1000) == NULL);