Changeset 14870

Timestamp:

Sep 17, 2007, 11:40:22 AM (19 years ago)

Author:

Paul Price

Message:

Avoiding error from getting subimage of NULL mask. Plugging memory leak.

File:

• trunk/psModules/src/imcombine/pmSubtraction.c (modified) (2 diffs)

trunk/psModules/src/imcombine/pmSubtraction.c

@@ -4 +4 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.61 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-17 20:58:53 $
+ *  @version $Revision: 1.62 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-09-17 21:40:22 $
  *
  *  Copyright 2004-2007 Institute for Astronomy, University of Hawaii
@@ -372 +372 @@
     // Casting away const so psImageSubset can add the child
     psImage *subImage = psImageSubset((psImage*)image, border); // Subimage to convolve
-    psImage *subMask = psImageSubset((psImage*)mask, border); // Subimage mask
+    psImage *subMask = mask ? psImageSubset((psImage*)mask, border) : NULL; // Subimage mask
     psImage *convolved = psImageConvolveFFT(subImage, subMask, PM_SUBTRACTION_MASK_REF,
                                             kernel, 0.0); // Convolution
     psFree(subImage);
+    psFree(subMask);
 
     // Now, we have to chop off the borders, and stick it in where it belongs