Pārlūkot izejas kodu

Merge pull request #9586 from ghalliday/issue17026

HPCC-17026 Remove minor leaks from roxiemem unit tests

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 8 gadi atpakaļ
vecāks
revīzija
25778ec32e
1 mainītis faili ar 5 papildinājumiem un 1 dzēšanām
  1. 5 1
      roxie/roxiemem/roxiemem.cpp

+ 5 - 1
roxie/roxiemem/roxiemem.cpp

@@ -7606,6 +7606,10 @@ protected:
 
         delete [] slaveManagers;
 
+        for (unsigned i3 = 0; i3 < numSlaves; i3++)
+            delete allocators[i3];
+        delete [] allocators;
+
         unsigned elapsed = endTime - startTime;
         DBGLOG("Slave spill (%u,%u) = %ums", numSlaves, numIter, elapsed);
     }
@@ -7627,7 +7631,7 @@ protected:
         memsize_t maxMemory = heapTotalPages * HEAP_ALIGNMENT_SIZE;
         memsize_t wasted = 0;
 
-        void * * pages = new void * [heapTotalPages];
+        std::unique_ptr<void *[]> pages(new void * [heapTotalPages]);
         //Allocate a whole set of 1 page allocations
         unsigned scale = 1;
         memsize_t curSize =  HEAP_ALIGNMENT_SIZE * scale - HugeHeaplet::dataOffset();