From daa0985a41f54678b73c4834e2bc24eab35f1246 Mon Sep 17 00:00:00 2001
From: Christopher Lackner <clackner@cerbsim.com>
Date: Wed, 7 Apr 2021 09:58:53 +0200
Subject: [PATCH] trace memory free only when array owns memory

---
 libsrc/core/array.hpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/libsrc/core/array.hpp b/libsrc/core/array.hpp
index 1875f38f..29f80df9 100644
--- a/libsrc/core/array.hpp
+++ b/libsrc/core/array.hpp
@@ -792,8 +792,9 @@ namespace ngcore
     /// if responsible, deletes memory
     NETGEN_INLINE ~Array()
     {
+      if(mem_to_delete)
+        mt.Free(sizeof(T)*allocsize);
       delete [] mem_to_delete;
-      mt.Free(sizeof(T)*allocsize);
     }
 
     // Only provide this function if T is archivable
@@ -847,8 +848,9 @@ namespace ngcore
     /// assigns memory from local heap
     NETGEN_INLINE const Array & Assign (size_t asize, LocalHeap & lh)
     {
+      if(mem_to_delete)
+        mt.Free(sizeof(T)*allocsize);
       delete [] mem_to_delete;
-      mt.Free(sizeof(T)*allocsize);
       size = allocsize = asize;
       data = lh.Alloc<T> (asize);
       mem_to_delete = nullptr;
@@ -955,8 +957,9 @@ namespace ngcore
     /// Deallocate memory
     NETGEN_INLINE void DeleteAll ()
     {
+      if(mem_to_delete)
+        mt.Free(sizeof(T)*allocsize);
       delete [] mem_to_delete;
-      mt.Free(sizeof(T)*allocsize);
       mem_to_delete = NULL;
       data = 0;
       size = allocsize = 0;
@@ -1108,8 +1111,9 @@ namespace ngcore
         else
           for (size_t i = 0; i < mins; i++) data[i] = std::move(hdata[i]);
 #endif
+        if(mem_to_delete)
+          mt.Free(sizeof(T) * allocsize);
         delete [] mem_to_delete;
-        mt.Free(sizeof(T) * allocsize);
       }
 
     mem_to_delete = data;