From 9dda7a59ddebcdd82e8e350985aa0d7477bd6991 Mon Sep 17 00:00:00 2001
From: Marty Kraimer <mrkraimer@comcast.net>
Date: Fri, 3 Jun 2011 17:10:23 -0400
Subject: [PATCH] fix memory leak in monitorQueue.cpp

---
 pvDataApp/monitor/monitorQueue.cpp | 8 ++++++--
 pvDataApp/monitor/monitorQueue.h   | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pvDataApp/monitor/monitorQueue.cpp b/pvDataApp/monitor/monitorQueue.cpp
index 43d4c02..e383fd2 100644
--- a/pvDataApp/monitor/monitorQueue.cpp
+++ b/pvDataApp/monitor/monitorQueue.cpp
@@ -68,14 +68,13 @@ MonitorQueue::MonitorQueue(PVStructureSharedPointerPtrArray structures,int numbe
 : number(number),
   structures(structures),
   queue(0),
+  queueElements(new MonitorElement::shared_pointer*[number]),
   nullElement(MonitorElement::shared_pointer())
 {
     if(number<2) {
          throw std::logic_error(String("queueSize must be >=2"));
     }
     
-    MonitorElement::shared_pointer ** queueElements 
-        = new MonitorElement::shared_pointer*[number];
     for(int i=0; i<number; i++) {
         queueElements[i] = new MonitorElement::shared_pointer(
                new MonitorElementImpl(*structures[i]));
@@ -95,6 +94,10 @@ MonitorQueue::MonitorQueue(PVStructureSharedPointerPtrArray structures,int numbe
 MonitorQueue::~MonitorQueue()
 {
     delete queue;
+    for(int i=0; i<number; i++) {
+          delete queueElements[i];
+    }
+    delete[] queueElements;
     for(int i=0; i<number; i++) delete structures[i];
     delete[] structures;
 }
@@ -107,6 +110,7 @@ PVStructureSharedPointerPtrArray MonitorQueue::createStructures(
     for(int i=0; i<number; i++){
         elements[i] =  new PVStructure::shared_pointer(array[i]);
     }
+    delete[] array;
     return elements;
 }
 
diff --git a/pvDataApp/monitor/monitorQueue.h b/pvDataApp/monitor/monitorQueue.h
index 58ad504..8d6ee47 100644
--- a/pvDataApp/monitor/monitorQueue.h
+++ b/pvDataApp/monitor/monitorQueue.h
@@ -39,6 +39,7 @@ private:
     int number;
     PVStructureSharedPointerPtrArray structures;
     Queue<MonitorElement::shared_pointer> *queue;
+    MonitorElement::shared_pointer **queueElements;
     MonitorElement::shared_pointer nullElement;
 };