Changeset 13858

Timestamp:

Jun 16, 2007, 3:18:08 PM (19 years ago)

Author:

Paul Price

Message:

Squashing memory leaks involving multiple camera/formats.

File:

• trunk/psModules/src/config/pmConfig.c (modified) (4 diffs)

trunk/psModules/src/config/pmConfig.c

@@ -4 +4 @@
  *  @author EAM (IfA)
  *
- *  @version $Revision: 1.97 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-06-14 20:56:57 $
+ *  @version $Revision: 1.98 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-06-17 01:18:08 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -700 +700 @@
                 continue;
             }
-            psMetadata *newRule = psMetadataLookupMetadata(NULL, filerules, new); // New rule (replacement)
-            if (!newRule) {
+            psMetadataItem *newItem = psMetadataLookup(filerules, new); // The rule of interest, or a redir.
+            if (!newItem) {
                 psWarning("Can't find file rule %s in camera %s --- ignored.", new, cameraItem->name);
+                continue;
+            }
+            psMetadata *newRule;        // New rule (replacement)
+            switch (newItem->type) {
+              case PS_DATA_STRING:
+                // A redirection
+                newRule = psMetadataLookupMetadata(NULL, filerules, newItem->data.str);
+                break;
+              case PS_DATA_METADATA:
+                // The rule itself
+                newRule = newItem->data.md;
+                break;
+              default:
+                psWarning("Unable to find filerule %s of the correct type in camera %s --- ignored.",
+                          new, cameraItem->name);
                 continue;
             }
@@ -940 +955 @@
             psMetadata *testCamera = camerasItem->data.md; // Camera to test against what we've got:
             if (formatFromHeader(&format, &name, testCamera, header, camerasItem->name)) {
-                config->camera = psMemIncrRefCounter(testCamera);
-                config->cameraName = psStringCopy(camerasItem->name);
-                config->formatName = name;
-                config->format = format;
+                // Set the defaults, if they are not already set
+                if (!config->camera && !config->cameraName) {
+                    config->camera = psMemIncrRefCounter(testCamera);
+                    config->cameraName = psStringCopy(camerasItem->name);
+                }
+                if (!config->format && !config->formatName) {
+                    config->formatName = name;
+                    config->format = format;
+                } else {
+                    psFree(name);
+                    psFree(format);
+                }
             } else {
                 psErr *error = psErrorLast();
@@ -975 +998 @@
     }
 
-    // Free the format and name just in case they've already been allocated
-    if (config->format || config->formatName) {
-        if (config->format != format || strcmp(config->formatName, name) != 0) {
-            psWarning("Default camera format configuration has changed!\n");
-        }
-        psFree(config->format);
-        psFree(config->formatName);
-    }
-    config->formatName = name;
-    config->format = format;
-    return psMemIncrRefCounter(format);
+    if (!config->format && !config->formatName) {
+        config->formatName = name;
+        config->format = format;
+    } else {
+        psFree(name);
+    }
+    return format;
 }