From 648f209cfe10c47bc51dc45728b036426ce556e6 Mon Sep 17 00:00:00 2001
From: Leonardo de Moura <leonardo@microsoft.com>
Date: Sun, 21 Sep 2014 10:54:41 -0700
Subject: [PATCH] fix(util/memory): redefine the non-throwing versions of the
 new operator.

In some platforms, the following operator new is used

   void* operator new(std::size_t sz, std::nothrow_t const &)

Since, it was not defined by memory.cpp, a crash would happen whenever
our delete was invoked.

   void  operator delete(void * ptr) throw() { return lean::free(ptr); }

Our delete assumes the memory was allocated with our new at memory.cpp

   void* operator new(std::size_t sz)
---
 src/util/memory.cpp | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/util/memory.cpp b/src/util/memory.cpp
index b7e30c06b..58b9bd9ff 100644
--- a/src/util/memory.cpp
+++ b/src/util/memory.cpp
@@ -14,12 +14,18 @@ size_t     get_allocated_memory() {
     return 0;
 }
 
-void * malloc(size_t sz)  {
+void * malloc(size_t sz, bool use_ex)  {
     void * r = ::malloc(sz);
     if (r || sz == 0)
         return r;
-    else
+    else if (use_ex)
         throw std::bad_alloc();
+    else
+        return nullptr;
+}
+
+void * malloc(size_t sz) {
+    return malloc(sz, true);
 }
 
 void * realloc(void * ptr, size_t sz) {
@@ -105,17 +111,23 @@ static alloc_info                          g_global_memory;
 
 size_t     get_allocated_memory() { return g_global_memory.size(); }
 
-void * malloc(size_t sz)  {
+void * malloc(size_t sz, bool use_ex)  {
     void * r = malloc_core(sz);
     if (r || sz == 0) {
         size_t rsz = malloc_size(r);
         g_global_memory.inc(rsz);
         return r;
-    } else {
+    } else if (use_ex) {
         throw std::bad_alloc();
+    } else {
+        return nullptr;
     }
 }
 
+void * malloc(size_t sz) {
+    return malloc(sz, true);
+}
+
 void * realloc(void * ptr, size_t sz) {
     if (ptr == nullptr)
         return malloc(sz);
@@ -143,8 +155,10 @@ void free(void * ptr) {
 }
 }
 
-void* operator new(std::size_t sz) throw(std::bad_alloc) { return lean::malloc(sz); }
+void* operator new(std::size_t sz) throw(std::bad_alloc) { return lean::malloc(sz, true); }
 void  operator delete(void * ptr) throw() { return lean::free(ptr); }
-void* operator new[](std::size_t sz) throw(std::bad_alloc) { return lean::malloc(sz); }
+void* operator new[](std::size_t sz) throw(std::bad_alloc) { return lean::malloc(sz, true); }
 void  operator delete[](void * ptr) throw() { return lean::free(ptr); }
+void* operator new(std::size_t sz, std::nothrow_t const &) { return lean::malloc(sz, false); }
+void* operator new[](std::size_t sz, std::nothrow_t const &) { return lean::malloc(sz, false); }
 #endif