fix for COMPILER-8945: nothrow operator new should return NULL if new handler throws std::bad_alloc

1 files changed, 8 insertions, 1 deletions

diff --git a/src/memory.cc b/src/memory.cc
index 16167ff..7e0fc3c 100644
--- a/src/memory.cc
+++ b/src/memory.cc
@@ -51,7 +51,14 @@ void * operator new(size_t size, const std::nothrow_t &) throw() {
     void * mem = malloc(size);
     while(mem == NULL) {
         if(new_handl != NULL) {
-            new_handl();
+            try {
+                new_handl();
+            }
+            catch(std::bad_alloc &) {
+                // nothrow operator new should return NULL in case of
+                // std::bad_alloc exception in new handler
+                return NULL;
+            }
         } else {
             return NULL;
         }