From 7ff3ec2bf74b9014279103a55b632df182dacc7c Mon Sep 17 00:00:00 2001
From: daan <daanl@outlook.com>
Date: Wed, 29 Jan 2020 17:25:40 -0800
Subject: [PATCH] use EFAULT for buffer overflow and call abort in debug mode
 (as well as secure mode)

---
 src/alloc.c   | 2 +-
 src/options.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/alloc.c b/src/alloc.c
index e4324d73..6852d652 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -187,7 +187,7 @@ static void mi_check_padding(const mi_page_t* page, const mi_block_t* block) {
   mi_block_t* const padding = (mi_block_t*)((uint8_t*)block + page->xblock_size - MI_PADDING);
   mi_block_t* const decoded = mi_block_nextx(page, padding, page->key[0], page->key[1]);
   if (decoded != block) {
-    _mi_error_message(EINVAL, "buffer overflow in heap block %p: write after %zu bytes\n", block, page->xblock_size);
+    _mi_error_message(EFAULT, "buffer overflow in heap block %p: write after %zu bytes\n", block, page->xblock_size);
   }
 }
 #else 
diff --git a/src/options.c b/src/options.c
index af051aa2..7559a4b5 100644
--- a/src/options.c
+++ b/src/options.c
@@ -319,6 +319,14 @@ static volatile _Atomic(void*) mi_error_arg;     // = NULL
 
 static void mi_error_default(int err) {
   UNUSED(err);
+#if (MI_DEBUG>0) 
+  if (err==EFAULT) {
+    #ifdef _MSC_VER
+    __debugbreak();
+    #endif
+    abort();
+  }
+#endif
 #if (MI_SECURE>0)
   if (err==EFAULT) {  // abort on serious errors in secure mode (corrupted meta-data)
     abort();