From 903aeda83645508ae0b40c53efedf9be00448e4c Mon Sep 17 00:00:00 2001
From: John Sully <john@csquare.ca>
Date: Wed, 20 May 2020 15:57:08 -0400
Subject: [PATCH] Override missing new, fix new/delete mismatch

Former-commit-id: 712d825c233c3ebbc49b22b8c1865916ca9dc3bc
---
 src/new.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/new.cpp b/src/new.cpp
index 33693da7a..586c4fefd 100644
--- a/src/new.cpp
+++ b/src/new.cpp
@@ -1,6 +1,7 @@
 #include <cstddef>  // std::size_t
 #include "server.h"
 #include "new.h"
+#include <new>
 
 #ifdef SANITIZE
 void *operator new(size_t size, enum MALLOC_CLASS mclass)
@@ -21,6 +22,11 @@ void *operator new(size_t size, enum MALLOC_CLASS mclass)
     return zmalloc(size, mclass);
 }
 
+void *operator new(std::size_t size, const std::nothrow_t &)
+{
+    return zmalloc(size, MALLOC_LOCAL);
+}
+
 void operator delete(void * p) noexcept
 {
     zfree(p);
@@ -31,4 +37,4 @@ void operator delete(void *p, std::size_t) noexcept
     zfree(p);
 }
 
-#endif
\ No newline at end of file
+#endif