From de19e4b4dcba15decdfa1dbc852af03aa9e8c0b6 Mon Sep 17 00:00:00 2001
From: Marty Kraimer <mrkraimer@comcast.net>
Date: Thu, 10 Feb 2011 04:56:39 -0500
Subject: [PATCH] fixed memory leak in Convert. Cleaned up test/testProperty

---
 pvDataApp/factory/Convert.cpp |  1 +
 test/testAll.sh               |  1 +
 test/testProperty             | 34 ++++++++++++++++------------------
 test/testPropertyAux          |  2 +-
 test/testPropertyGold         | 34 ++++++++++++++++------------------
 5 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/pvDataApp/factory/Convert.cpp b/pvDataApp/factory/Convert.cpp
index 7868f0c..e79b672 100644
--- a/pvDataApp/factory/Convert.cpp
+++ b/pvDataApp/factory/Convert.cpp
@@ -621,6 +621,7 @@ void Convert::copyStructureArray(
     toArray = structureArrayData.data;
     for(int i=0; i<length; i++) {
     	if(fromArray[i]==0) {
+            if(toArray[i]!=0) delete toArray[i];
             toArray[i] = 0;
     	} else {
     	    if(toArray[i]==0) {
diff --git a/test/testAll.sh b/test/testAll.sh
index 9628ee3..6a40d4a 100755
--- a/test/testAll.sh
+++ b/test/testAll.sh
@@ -16,3 +16,4 @@
 ./testQueue.sh || exit $?
 ./testMessageQueue.sh || exit $?
 ./testSerialization.sh || exit $?
+./testProperty.sh || exit $?
diff --git a/test/testProperty b/test/testProperty
index 6d0c59b..a27b5d5 100644
--- a/test/testProperty
+++ b/test/testProperty
@@ -1,19 +1,19 @@
 structure value
     double value 0
-    structure alarm
+    alarm alarm
         int severity 0
         string message 
-    structure timeStamp
+    timeStamp timeStamp
         long secondsPastEpoch 0
         int nanoSeconds 0
-    structure display
+    display display
         string description 
         string format 
         string units 
         structure limit
             double low 0
             double high 0
-    structure control
+    control control
         structure limit
             double low 0
             double high 0
@@ -21,11 +21,11 @@ structure value
 structure value
     structure value
         int index 0
-        stringArray choices [0,1,2,3]
-    structure alarm
+        string[] choices [0,1,2,3]
+    alarm alarm
         int severity 0
         string message 
-    structure timeStamp
+    timeStamp timeStamp
         long secondsPastEpoch 0
         int nanoSeconds 0
 testAlarm
@@ -41,20 +41,20 @@ index 2 choice 2
 doubleRecord
 structure value
     double value 0
-    structure alarm
+    alarm alarm
         int severity 2
         string message testMessage
-    structure timeStamp
+    timeStamp timeStamp
         long secondsPastEpoch 0
         int nanoSeconds 0
-    structure display
+    display display
         string description testDescription
         string format %f10.0
         string units volts
         structure limit
             double low -10
             double high -1
-    structure control
+    control control
         structure limit
             double low 1
             double high 10
@@ -63,14 +63,12 @@ enumeratedRecord
 structure value
     structure value
         int index 2
-        stringArray choices [0,1,2,3]
-    structure alarm
+        string[] choices [0,1,2,3]
+    alarm alarm
         int severity 0
         string message 
-    structure timeStamp
+    timeStamp timeStamp
         long secondsPastEpoch 0
         int nanoSeconds 0
-linkedListNode: totalConstruct 5 totalDestruct 0
-linkedList: totalConstruct 1 totalDestruct 0
-field: totalConstruct 127 totalDestruct 34 totalReference 93
-pvField: totalConstruct 30 totalDestruct 30
+pvField:  totalConstruct 30 totalDestruct 30
+field:  totalConstruct 99 totalDestruct 99
diff --git a/test/testPropertyAux b/test/testPropertyAux
index 8c0f4fb..94793b6 100644
--- a/test/testPropertyAux
+++ b/test/testPropertyAux
@@ -1 +1 @@
-2010.12.07 14:16:00 824222648 nanoSeconds isDst false
+2011.02.10 04:50:12 195472034 nanoSeconds isDst false
diff --git a/test/testPropertyGold b/test/testPropertyGold
index 6d0c59b..a27b5d5 100644
--- a/test/testPropertyGold
+++ b/test/testPropertyGold
@@ -1,19 +1,19 @@
 structure value
     double value 0
-    structure alarm
+    alarm alarm
         int severity 0
         string message 
-    structure timeStamp
+    timeStamp timeStamp
         long secondsPastEpoch 0
         int nanoSeconds 0
-    structure display
+    display display
         string description 
         string format 
         string units 
         structure limit
             double low 0
             double high 0
-    structure control
+    control control
         structure limit
             double low 0
             double high 0
@@ -21,11 +21,11 @@ structure value
 structure value
     structure value
         int index 0
-        stringArray choices [0,1,2,3]
-    structure alarm
+        string[] choices [0,1,2,3]
+    alarm alarm
         int severity 0
         string message 
-    structure timeStamp
+    timeStamp timeStamp
         long secondsPastEpoch 0
         int nanoSeconds 0
 testAlarm
@@ -41,20 +41,20 @@ index 2 choice 2
 doubleRecord
 structure value
     double value 0
-    structure alarm
+    alarm alarm
         int severity 2
         string message testMessage
-    structure timeStamp
+    timeStamp timeStamp
         long secondsPastEpoch 0
         int nanoSeconds 0
-    structure display
+    display display
         string description testDescription
         string format %f10.0
         string units volts
         structure limit
             double low -10
             double high -1
-    structure control
+    control control
         structure limit
             double low 1
             double high 10
@@ -63,14 +63,12 @@ enumeratedRecord
 structure value
     structure value
         int index 2
-        stringArray choices [0,1,2,3]
-    structure alarm
+        string[] choices [0,1,2,3]
+    alarm alarm
         int severity 0
         string message 
-    structure timeStamp
+    timeStamp timeStamp
         long secondsPastEpoch 0
         int nanoSeconds 0
-linkedListNode: totalConstruct 5 totalDestruct 0
-linkedList: totalConstruct 1 totalDestruct 0
-field: totalConstruct 127 totalDestruct 34 totalReference 93
-pvField: totalConstruct 30 totalDestruct 30
+pvField:  totalConstruct 30 totalDestruct 30
+field:  totalConstruct 99 totalDestruct 99