Changeset 13422

Timestamp:

May 18, 2007, 4:02:09 AM (19 years ago)

Author:

rhl

Message:

handle NULL modelPSF; fix memory leaks

File:

• trunk/psModules/src/objects/pmPSFtry.c (modified) (5 diffs)

trunk/psModules/src/objects/pmPSFtry.c

@@ -5 +5 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-04-28 01:32:05 $
+ *  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-05-18 14:02:09 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -116 +116 @@
         if (source->modelEXT == NULL) {
             psError(PS_ERR_UNKNOWN, false, "failed to build model");
+            psFree(psfTry);
             return NULL;
         }
@@ -138 +139 @@
     if (!pmPSFFromPSFtry (psfTry, applyWeights)) {
         psError(PS_ERR_UNKNOWN, false, "failed to construct a psf model from collection of sources");
+        psFree(psfTry);
         return NULL;
     }
@@ -152 +154 @@
         // set shape for this model based on PSF
         source->modelPSF = pmModelFromPSF (source->modelEXT, psfTry->psf);
+        if (source->modelPSF == NULL) {
+            continue;
+        }
         source->modelPSF->radiusFit = RADIUS;
 
@@ -272 +277 @@
     if (!result) {
         psError(PS_ERR_UNKNOWN, false, "Failed to fit clipped poly");
+
+        psFree(poly);
+        psFree(r2rflux);
+        psFree(stats);
+
         return false;
     }