Changeset 17385

Timestamp:

Apr 7, 2008, 5:04:08 PM (18 years ago)

Author:

eugene

Message:

catch errors from psphotKernelFromPSF and pmSourceModelGuess

File:

• branches/eam_branch_20080324/psphot/src/psphotPSFConvModel.c (modified) (2 diffs)

branches/eam_branch_20080324/psphot/src/psphotPSFConvModel.c

@@ -16 +16 @@
     // convert the cached cached psf model for this source to a psKernel
     psKernel *psf = psphotKernelFromPSF (source, psfSize);
+    if (!psf) return NULL;
 
 # if (USE_DELTA_PSF)
@@ -28 +29 @@
     // use the source moments, etc to guess basic model parameters
     pmModel *modelConv = pmSourceModelGuess (source, modelType);
-    PS_ASSERT (modelConv, NULL);
+    if (!modelConv) {
+        psFree (psf);
+        return NULL;
+    }
 
     // XXX test : modify the Io, SXX, SYY terms based on the psf SXX, SYY terms: