Changeset 27330 for trunk/psModules/src/objects/pmPSFtryModel.c

Timestamp:

Mar 18, 2010, 1:04:34 PM (16 years ago)

Author:

Paul Price

Message:

Plugging memory leak when not fitting chi^{2 flux trend.}

File:

• trunk/psModules/src/objects/pmPSFtryModel.c (modified) (3 diffs)

trunk/psModules/src/objects/pmPSFtryModel.c

@@ -78 +78 @@
     }
 
-    // this is a bit tricky, because we have two cases (MAP vs POLY), and they have a different 
-    // definition for 'order' (order_MAP = order_POLY + 1).  in addition, we have a 
+    // this is a bit tricky, because we have two cases (MAP vs POLY), and they have a different
+    // definition for 'order' (order_MAP = order_POLY + 1).  in addition, we have a
     // user-specified MAX order, which we should respect, regardless of the mode
 
@@ -93 +93 @@
     int orderMin = 0;
     if (options->psfTrendMode == PM_TREND_MAP) {
-        MaxOrderForStars ++;
-        orderMin ++;
+        MaxOrderForStars ++;
+        orderMin ++;
     }
     orderMax = PS_MIN (orderMax, MaxOrderForStars);
@@ -204 +204 @@
                   psStatsGetValue(stats, meanStat), psStatsGetValue(stats, stdevStat));
 
-        psFree(flux);
-        psFree(mask);
-        psFree(chisq);
-
         if (!result) {
             psError(PS_ERR_UNKNOWN, false, "Failed to fit psf->ChiTrend");
             psFree(psfTry);
-            return NULL;
-        }
-    }
+            psFree(flux);
+            psFree(mask);
+            psFree(chisq);
+            return NULL;
+        }
+    }
+
+    psFree(flux);
+    psFree(mask);
+    psFree(chisq);
 
     for (int i = 0; i < psfTry->psf->ChiTrend->nX + 1; i++) {