Changeset 13675

Timestamp:

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

Author:

eugene

Message:

fixing double frees, leaks

Location:

trunk

Files:

• ppImage/src/ppImageLoop.c (modified) (4 diffs)
• ppStats/src/ppStats.c (modified) (2 diffs)
• ppStats/src/ppStats.h (modified) (1 diff)
• ppStats/src/ppStatsLoop.c (modified) (2 diffs)
• ppStats/src/ppStatsLoop.h (modified) (1 diff)
• ppStats/src/ppStatsStandAlone.c (modified) (1 diff)

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);
     }

trunk/ppStats/src/ppStats.c

@@ -9 +9 @@
 #include "ppStats.h"
 
-psMetadata *ppStats(psMetadata *out,    // Output metadata
-                    pmFPA *fpa,         // FPA for which to get statistics
+psMetadata *ppStats(pmFPA *fpa,         // FPA for which to get statistics
                     pmFPAview *view,    // View for analysis
                     psMaskType maskVal, // Value to mask
@@ -46 +45 @@
     // Go through the FPA and do the hard work
     psExit status;                      // Status of statistics loop
-    psMetadata *result = ppStatsLoop(&status, out, data, config);
+    psMetadata *result = ppStatsLoop(&status, data, config);
     if (status != PS_EXIT_SUCCESS) {
         psError (PS_ERR_UNKNOWN, false, "Not able to measure FPA statistics.\n");

trunk/ppStats/src/ppStats.h

@@ -12 +12 @@
 
 // Perform the ppStats steps
-psMetadata *ppStats(psMetadata *out,    // Output metadata
-                    pmFPA *fpa,         // FPA for which to get statistics
+psMetadata *ppStats(pmFPA *fpa,         // FPA for which to get statistics
                     pmFPAview *view,    // View for analysis
                     psMaskType maskVal, // Value to mask

trunk/ppStats/src/ppStatsLoop.c

@@ -353 +353 @@
 
 psMetadata *ppStatsLoop(psExit *result,
-                        psMetadata *fpaResults, // Metadata to hold the FPA results
                         ppStatsData *data, // The data
                         const pmConfig *config // Configuration
@@ -369 +368 @@
 
     // allocate a new one if needed
-    psMetadata *newResults = fpaResults;
-    if (!newResults) {
-        newResults = psMetadataAlloc();
-    }
+    psMetadata *newResults = psMetadataAlloc();
 
     // Iterate through the FPA

trunk/ppStats/src/ppStatsLoop.h

@@ -7 +7 @@
 // Loop over the input image and do all the hard work
 psMetadata *ppStatsLoop(psExit *result,
-                        psMetadata *fpaResults, // Metadata to hold the FPA results
                         ppStatsData *data, // The data
                         const pmConfig *config // Configuration

trunk/ppStats/src/ppStatsStandAlone.c

@@ -58 +58 @@
 
     // Go through the FPA and do the hard work
-    psMetadata *results = ppStatsLoop(&status, NULL, data, config);
+    psMetadata *results = ppStatsLoop(&status, data, config);
     if (status != PS_EXIT_SUCCESS) {
         psErrorStackPrint(stderr, "Error in stats loop.\n");