Changeset 9363 for trunk/psModules/src/camera/pmFPAview.c

Timestamp:

Oct 6, 2006, 11:45:58 AM (20 years ago)

Author:

magnier

Message:

fixed segfault in pmFPAviewThisPHU for SPLIT files

File:

• trunk/psModules/src/camera/pmFPAview.c (modified) (5 diffs)

trunk/psModules/src/camera/pmFPAview.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-09-15 09:49:01 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-06 21:45:58 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -72 +72 @@
     PS_ASSERT_PTR_NON_NULL(view, NULL);
     PS_ASSERT_PTR_NON_NULL(fpa, NULL);
+    PS_ASSERT_PTR_NON_NULL(fpa->chips, NULL);
 
     if (view->chip < 0) {
@@ -267 +268 @@
     if (view->chip < 0) {
         hdu = pmHDUFromFPA (fpa);
+        if (!hdu)
+            return NULL;
         if (hdu->blankPHU)
             return hdu;
@@ -274 +277 @@
         chip = pmFPAviewThisChip (view, fpa);
         hdu  = pmHDUFromChip (chip);
+        if (!hdu)
+            return NULL;
         if (hdu->blankPHU)
             return hdu;
@@ -283 +288 @@
         cell = pmFPAviewThisCell (view, fpa);
         hdu  = pmHDUFromCell (cell);
+        if (!hdu) {
+            psAbort("psModules", "a split readout is not covered by the current paradigm");
+        }
         if (hdu->blankPHU)
             return hdu;