From ea399660ce686547111099f8d1e922f74ce2bdcb Mon Sep 17 00:00:00 2001
From: Matthew Parkinson <mattpark@microsoft.com>
Date: Tue, 2 Jul 2019 15:58:19 +0100
Subject: [PATCH] Fix for zero size allocations.

---
 src/mem/alloc.h        | 2 ++
 src/override/malloc.cc | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/mem/alloc.h b/src/mem/alloc.h
index 5e09d70..e63a4ec 100644
--- a/src/mem/alloc.h
+++ b/src/mem/alloc.h
@@ -473,6 +473,8 @@ namespace snmalloc
     SNMALLOC_SLOW_PATH void dealloc_not_small(void* p, uint8_t size)
     {
       handle_message_queue();
+      
+      if (p == nullptr) return;
 
       if (size == PMMediumslab)
       {
diff --git a/src/override/malloc.cc b/src/override/malloc.cc
index 1e55b84..42c1fd2 100644
--- a/src/override/malloc.cc
+++ b/src/override/malloc.cc
@@ -28,9 +28,6 @@ extern "C"
 
   SNMALLOC_EXPORT void SNMALLOC_NAME_MANGLE(free)(void* ptr)
   {
-    if (ptr == nullptr)
-      return;
-
     ThreadAlloc::get()->dealloc(ptr);
   }