Changeset 13675 for trunk/ppImage/src/ppImageLoop.c

Timestamp:

Jun 5, 2007, 6:31:38 PM (19 years ago)

Author:

eugene

Message:

fixing double frees, leaks

File:

• trunk/ppImage/src/ppImageLoop.c (modified) (4 diffs)

trunk/ppImage/src/ppImageLoop.c

@@ -10 +10 @@
 bool ppImageLoop (pmConfig *config, ppImageOptions *options) {
 
+    bool mdok;                      // Status of MD lookup
     bool status;
     pmChip *chip;
     pmCell *cell;
     pmReadout *readout;
-
-    bool mdok;                      // Status of MD lookup
+    psMetadata *stats = NULL;
+
     const char *statsName = psMetadataLookupStr(&mdok, config->arguments, "STATS"); // Filename for statistics
-    psMetadata *stats = NULL;           // Container for statistics
     FILE *statsFile = NULL;             // File stream for statistics
     if (mdok && statsName && strlen(statsName) > 0) {
@@ -27 +27 @@
             return false;
         } else {
-            stats = psMetadataAlloc();
+            stats = psMetadataAlloc();
         }
         psFree(resolved);
@@ -123 +123 @@
                     return false;
                 }
-                ppStats(stats, output->fpa, view,
-                        options->satMask | options->badMask | options->maskValue,
-                        config);
+                psMetadata *newStats = ppStats(output->fpa, view,
+                                               options->satMask | options->badMask | options->maskValue,
+                                               config);
+                if (!newStats) {
+                    psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to generate stats for image.\n");
+                    return false;
+                }
+                psMetadataCopy (stats, newStats);
+                psFree (newStats);
             }
 
@@ -200 +206 @@
         psFree((void *)statsMDC);
         fclose(statsFile);
-
         psFree(stats);
     }