Changeset 16710 for trunk/psModules/src/concepts/pmConceptsAverage.c

Timestamp:

Feb 28, 2008, 10:40:04 AM (18 years ago)

Author:

Paul Price

Message:

Attempt to plug memory leak.

File:

• trunk/psModules/src/concepts/pmConceptsAverage.c (modified) (2 diffs)

trunk/psModules/src/concepts/pmConceptsAverage.c

@@ -18 +18 @@
     psMetadataItem *item = psMetadataLookup(MD, NAME); \
     item->data.TYPE = VALUE; \
+}
+
+// Update a metadata string entry directly
+#define MD_UPDATE_STR(MD, NAME, VALUE) \
+{ \
+    psMetadataItem *item = psMetadataLookup(MD, NAME); \
+    psFree(item->data.str); \
+    item->data.str = psStringCopy(VALUE); \
 }
 
@@ -64 +72 @@
 
     MD_UPDATE(target->concepts, "FPA.TIMESYS", S32, timeSys);
-    // XXX: The following is causing a memory leak in the test code.  Not sur ehow to fix it.
-    MD_UPDATE(target->concepts, "FPA.FILTER", str, psStringCopy(filter));
-    //psMetadataRemoveKey(target->concepts, "FPA.TIMESYS");
-    //psMetadataAddStr(target->concepts, PS_LIST_HEAD, "FPA.TIMESYS", PS_META_REPLACE, NULL, filter);
+    MD_UPDATE_STR(target->concepts, "FPA.FILTER", filter);
 
     // FPA.TIME needs special care