Changeset 7057

Timestamp:

May 3, 2006, 2:37:44 PM (20 years ago)

Author:

drobbin

Message:

fixed seg fault occuring from NULL input image in imageSubset. Moved NULL check back to top of fxn.

File:

• trunk/psLib/src/imageops/psImageStructManip.c (modified) (3 diffs)

trunk/psLib/src/imageops/psImageStructManip.c

@@ -8 +8 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-21 21:10:01 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-05-04 00:37:44 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -33 +33 @@
     psS32 inputColOffset;       // offset in bytes to first subset pixel in input row
 
+    if (image == NULL || image->data.V == NULL) {
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psImage_IMAGE_NULL);
+        return NULL;
+    }
+
     if ( col0 < image->col0 || row0 < image->row0 ) {
         //        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
@@ -40 +46 @@
                 col0, col1-1, row0, row1-1,
                 image->numCols-1, image->numRows-1);
-        return NULL;
-    }
-
-    if (image == NULL || image->data.V == NULL) {
-        psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psImage_IMAGE_NULL);
         return NULL;
     }