Changeset 13688

Timestamp:

Jun 6, 2007, 2:36:33 PM (19 years ago)

Author:

Paul Price

Message:

Fixing double-free bug.

File:

• trunk/ppStats/src/ppStatsLoop.c (modified) (5 diffs)

trunk/ppStats/src/ppStatsLoop.c

@@ -114 +114 @@
     if (!data->doStats && psListLength(data->summary)) {
         // Nothing further to do --- don't want to waste our time reading the data
-        if (psListLength(cellResults->list) > 0) {
-            psMetadataAdd(chipResults, PS_LIST_TAIL, cellName, PS_DATA_METADATA,
-                          "Results for cell", cellResults);
-        }
         goto cellDone;
     }
@@ -152 +148 @@
     if (data->sample <= 0.0) {
         if (!psImageStats(data->stats, readout->image, readout->mask, data->maskVal)) {
-            psLogMsg(__func__, PS_LOG_WARN, "Unable to perform statistics on cell %s --- ignored.\n", cellName);
+            psWarning("Unable to perform statistics on cell %s --- ignored.\n", cellName);
             goto statsDone;
         }
@@ -210 +206 @@
 statsDone:
     // count saturated pixels
-    if (psListLength(data->summary) > 0)     {
+    if (psListLength(data->summary) > 0) {
         bool get_nSatPixels = false;
         bool get_fSatPixels = false;
@@ -316 +312 @@
         result = cellStats(chipResults, cell, fits, data, config);
         if (result != PS_EXIT_SUCCESS) {
-            psError (PS_ERR_IO, false, "trouble with cell stats for %d\n", view->cell);
-            if (fits) {
-                pmChipFreeData(chip);
-            }
-            psFree(chipResults);
-            return result;
+            psError(PS_ERR_UNKNOWN, false, "trouble with cell stats for %d\n", view->cell);
         }
         addToHierarchy(chipResults, fpaResults, chipName, "Results for chip");
-        psFree (chipResults);
+        psFree (chipResults);
         if (fits) {
             pmChipFreeData(chip);
         }
-        return PS_EXIT_SUCCESS;
+        return result;
     }
 
@@ -336 +327 @@
         result = cellStats(chipResults, cell, fits, data, config);
         if (result != PS_EXIT_SUCCESS) {
-            psError (PS_ERR_IO, false, "trouble with cell stats for %d\n", i);
+            psError(PS_ERR_UNKNOWN, false, "trouble with cell stats for %d\n", i);
             if (fits) {
                 pmChipFreeData(chip);