Changeset 7274 for trunk/psModules/src/camera/pmFPARead.c

Timestamp:

Jun 1, 2006, 12:43:26 PM (20 years ago)

Author:

Paul Price

Message:

Adding NULL checks at function start, to provide some robustness, following SEGVs when CELL.TRIMSEC specified incorrectly in the camera format configuration.

File:

• trunk/psModules/src/camera/pmFPARead.c (modified) (4 diffs)

trunk/psModules/src/camera/pmFPARead.c

@@ -33 +33 @@
         psFree(regionString);
         psFree(readout);
-        return NULL;
+        return false;
     }
     psRegion region = psRegionSet(MAX(trimsec->x0 - readout->col0, 0), // x0
@@ -59 +59 @@
             psFree(regionString);
             psFree(readout);
-            return NULL;
+            return false;
         }
         psRegion region = psRegionSet(MAX(biassec->x0 - readout->col0, 0), // x0
@@ -72 +72 @@
     psFree(iter);
 
-    return readout;
+    return true;
 }
 
@@ -326 +326 @@
 
         pmReadout *readout = pmReadoutAlloc(cell);
-        readoutCarve(readout, image, trimsec, biassecs);
+        if (!readoutCarve(readout, image, trimsec, biassecs)) {
+            psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to carve readout into image and bias sections.\n");
+            return NULL;
+        }
         readout->mask = NULL;
         readout->weight = NULL;