Changeset 29339

Timestamp:

Oct 6, 2010, 11:48:21 AM (16 years ago)

Author:

eugene

Message:

plug memory leaks

Location:

tags/ipp-20100823

Files:

• psLib/src/math/psMinimizeLMM.c (modified) (3 diffs)
• psphot/src/psphotSourceFits.c (modified) (1 diff)

tags/ipp-20100823/psLib/src/math/psMinimizeLMM.c

@@ -325 +325 @@
         chisq += PS_SQR(delta) * dy->data.F32[i];
 
-        if (isnan(dy->data.F32[i])) return NAN;
-        if (isnan(delta)) return NAN;
-        if (isnan(chisq)) return NAN;
+        if (isnan(dy->data.F32[i])) goto escape;
+        if (isnan(delta)) goto escape;
+        if (isnan(chisq)) goto escape;
 
         // we track alpha,beta and params,deriv separately
@@ -354 +354 @@
     psFree(deriv);
     return(chisq);
+
+escape:
+    psFree(deriv);
+    return NAN;
 }
 
@@ -448 +452 @@
     if (isnan(min->value)) {
         min->iter = min->maxIter;
+        psFree(alpha);
+        psFree(Alpha);
+        psFree(beta);
+        psFree(Beta);
+        psFree(Params);
         return(false);
     }

tags/ipp-20100823/psphot/src/psphotSourceFits.c

@@ -549 +549 @@
         // for the test fits, use a somewhat smaller radius
         psphotSetRadiusFootprint(&model->fitRadius, readout, source, markVal, 0.5);
-
+        
         if (!psphotFitSersicIndexPCM (pcm, readout, source, fitOptions, maskVal, markVal, psfSize)) {
+            psFree(pcm);
             model->flags |= PM_MODEL_STATUS_BADARGS;
             return model;