Changeset 7274

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.

Location:

trunk/psModules/src/camera

Files:

• pmFPA.c (modified) (25 diffs)
• pmFPAHeader.c (modified) (3 diffs)
• pmFPARead.c (modified) (4 diffs)

trunk/psModules/src/camera/pmFPA.c

@@ -12 +12 @@
 * XXX: Should we implement non-linear cell->chip transforms?
 *
-*  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-05-23 01:09:48 $
+*  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-06-01 22:43:26 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -136 +136 @@
 void pmCellFreeReadouts(pmCell *cell)
 {
+    PS_ASSERT_PTR_NON_NULL(cell,);
+
     //
     // Set the parent to NULL in all cell->readouts before psFree(cell->readouts)
@@ -156 +158 @@
 void pmChipFreeCells(pmChip *chip)
 {
+    PS_ASSERT_PTR_NON_NULL(chip,);
+
     //
     // Set the parent to NULL in all chip->cells before psFree(chip->cells)
@@ -175 +179 @@
 void pmCellFreeData(pmCell *cell)
 {
+    PS_ASSERT_PTR_NON_NULL(cell,);
+
     pmCellFreeReadouts(cell);
     if (cell->hdu) {
@@ -184 +190 @@
 void pmChipFreeData(pmChip *chip)
 {
+    PS_ASSERT_PTR_NON_NULL(chip,);
+
     for (int i = 0; i < chip->cells->n; i++) {
         pmCellFreeData(chip->cells->data[i]);
@@ -195 +203 @@
 void pmFPAFreeData(pmFPA *fpa)
 {
+    PS_ASSERT_PTR_NON_NULL(fpa,);
+
     for (int i = 0; i < fpa->chips->n; i++) {
         pmChipFreeData(fpa->chips->data[i]);
@@ -206 +216 @@
 pmReadout *pmReadoutAlloc(pmCell *cell)
 {
-    pmReadout *tmpReadout = (pmReadout *) psAlloc(sizeof(pmReadout));
+    pmReadout *tmpReadout = (pmReadout *)psAlloc(sizeof(pmReadout));
     psMemSetDeallocator(tmpReadout, (psFreeFunc) readoutFree);
 
@@ -215 +225 @@
     tmpReadout->analysis = psMetadataAlloc();
     tmpReadout->parent = cell;
-    if (cell != NULL) {
+    if (cell) {
         cell->readouts = psArrayAdd(cell->readouts, 1, (psPtr) tmpReadout);
     }
@@ -241 +251 @@
     tmpCell->readouts = psArrayAlloc(0);
     tmpCell->parent = chip;
-    if (chip != NULL) {
+    if (chip) {
         chip->cells = psArrayAdd(chip->cells, 1, (psPtr) tmpCell);
     }
@@ -256 +266 @@
     pmConceptsBlankCell(tmpCell);
 
-    return(tmpCell);
+    return tmpCell;
 }
 
@@ -263 +273 @@
     const char *name)
 {
-    pmChip *tmpChip = (pmChip *) psAlloc(sizeof(pmChip));
+    pmChip *tmpChip = (pmChip*)psAlloc(sizeof(pmChip));
     psMemSetDeallocator(tmpChip, (psFreeFunc) chipFree);
 
-    # if FPA_ASTROM
+    #if FPA_ASTROM
 
     tmpChip->col0 = 0;
-tmpChip->row0 = 0;
-tmpChip->toFPA = NULL;
-tmpChip->fromFPA = NULL;
-# endif
-
-tmpChip->analysis = psMetadataAlloc();
+    tmpChip->row0 = 0;
+    tmpChip->toFPA = NULL;
+    tmpChip->fromFPA = NULL;
+    # endif
+
+    tmpChip->analysis = psMetadataAlloc();
     tmpChip->cells = psArrayAlloc(0);
     tmpChip->parent = fpa;
-    if (fpa != NULL) {
-        psArrayAdd(fpa->chips, 1, (psPtr) tmpChip);
+    if (fpa) {
+        psArrayAdd(fpa->chips, 1, (psPtr)tmpChip);
     }
     tmpChip->hdu = NULL;
@@ -292 +302 @@
     }
     pmConceptsBlankChip(tmpChip);
-    return(tmpChip);
+    return tmpChip;
 }
 
@@ -300 +310 @@
     psMemSetDeallocator(tmpFPA, (psFreeFunc) FPAFree);
 
-    # if FPA_ASTROM
+    #if FPA_ASTROM
 
     tmpFPA->fromTangentPlane = NULL;
-tmpFPA->toTangentPlane = NULL;
-tmpFPA->projection = NULL;
-# endif
-
-tmpFPA->analysis = NULL;
-tmpFPA->camera = psMemIncrRefCounter((psPtr)camera);
+    tmpFPA->toTangentPlane = NULL;
+    tmpFPA->projection = NULL;
+    # endif
+
+    tmpFPA->analysis = NULL;
+    tmpFPA->camera = psMemIncrRefCounter((psPtr)camera);
     tmpFPA->chips = psArrayAlloc(0);
     tmpFPA->hdu = NULL;
@@ -316 +326 @@
     pmConceptsBlankFPA(tmpFPA);
 
-    return(tmpFPA);
-}
-
-static psBool cellCheckParents(pmCell *cell)
-{
-    if (!cell) {
-        return(true);
-    }
-    psBool flag = true;
-
-    for (psS32 i = 0 ; i < cell->readouts->n ; i++) {
+    return tmpFPA;
+}
+
+static bool cellCheckParents(pmCell *cell)
+{
+    PS_ASSERT_PTR_NON_NULL(cell, true);
+
+    bool flag = true;
+    for (long i = 0; i < cell->readouts->n ; i++) {
         pmReadout *tmpReadout = (pmReadout *) cell->readouts->data[i];
-        PS_ASSERT_PTR_NON_NULL(tmpReadout, false);
+        if (!tmpReadout) {
+            continue;
+        }
         if (tmpReadout->parent != cell) {
             tmpReadout->parent = cell;
@@ -334 +344 @@
         }
     }
-    return(flag);
-}
-
-static psBool chipCheckParents(pmChip *chip)
-{
-    if (!chip) {
-        return(true);
-    }
-    psBool flag = true;
-
-    for (psS32 i = 0 ; i < chip->cells->n ; i++) {
+    return flag;
+}
+
+static bool chipCheckParents(pmChip *chip)
+{
+    PS_ASSERT_PTR_NON_NULL(chip, true);
+
+    bool flag = true;
+    for (long i = 0; i < chip->cells->n ; i++) {
         pmCell *tmpCell = (pmCell *) chip->cells->data[i];
-        PS_ASSERT_PTR_NON_NULL(tmpCell, false);
+        if (!tmpCell) {
+            continue;
+        }
         if (tmpCell->parent != chip) {
             tmpCell->parent = chip;
@@ -354 +364 @@
         flag &= cellCheckParents(tmpCell);
     }
-    return(flag);
+    return flag;
 }
 
 psBool pmFPACheckParents(pmFPA *fpa)
 {
-    if (!fpa) {
-        return(true);
-    }
-    psBool flag = true;
-
-    for (psS32 i = 0 ; i < fpa->chips->n ; i++) {
+    PS_ASSERT_PTR_NON_NULL(fpa, true);
+
+    bool flag = true;
+    for (long i = 0; i < fpa->chips->n ; i++) {
         pmChip *tmpChip = (pmChip *) fpa->chips->data[i];
-        PS_ASSERT_PTR_NON_NULL(tmpChip, false);
+        if (!tmpChip) {
+            continue;
+        }
         if (tmpChip->parent != fpa) {
             tmpChip->parent = fpa;
@@ -374 +384 @@
         flag &= chipCheckParents(tmpChip);
     }
-    return(flag);
+    return flag;
 }
 
 /** functions to turn on/off the file_exists flag **/
-bool pmFPASetFileStatus (pmFPA *fpa, bool status)
-{
+bool pmFPASetFileStatus(pmFPA *fpa, bool status)
+{
+    PS_ASSERT_PTR_NON_NULL(fpa, false);
 
     for (int i = 0; i < fpa->chips->n; i++) {
@@ -388 +399 @@
 }
 
-bool pmChipSetFileStatus (pmChip *chip, bool status)
-{
+bool pmChipSetFileStatus pmChip *chip, bool status)
+{
+    PS_ASSERT_PTR_NON_NULL(chip, false);
 
     chip->file_exists = status;
@@ -399 +411 @@
 }
 
-bool pmCellSetFileStatus (pmCell *cell, bool status)
-{
+bool pmCellSetFileStatus(pmCell *cell, bool status)
+{
+    PS_ASSERT_PTR_NON_NULL(cell, false);
 
     cell->file_exists = status;
@@ -411 +424 @@
 
 /** functions to turn on/off the data_exists flag **/
-bool pmFPASetDataStatus (pmFPA *fpa, bool status)
-{
+bool pmFPASetDataStatus(pmFPA *fpa, bool status)
+{
+    PS_ASSERT_PTR_NON_NULL(fpa, false);
 
     for (int i = 0; i < fpa->chips->n; i++) {
@@ -421 +435 @@
 }
 
-bool pmChipSetDataStatus (pmChip *chip, bool status)
-{
+bool pmChipSetDataStatus(pmChip *chip, bool status)
+{
+    PS_ASSERT_PTR_NON_NULL(chip, false);
 
     chip->data_exists = status;
@@ -434 +449 @@
 bool pmCellSetDataStatus (pmCell *cell, bool status)
 {
+    PS_ASSERT_PTR_NON_NULL(cell, false);
 
     cell->data_exists = status;
@@ -507 +523 @@
 bool pmChipSelectCell(pmChip *chip, int cellNum, bool exclusive)
 {
-    assert(chip);
+    PS_ASSERT_PTR_NON_NULL(chip, false);
 
     psArray *cells = chip->cells;       // Component cells
@@ -548 +564 @@
     int chipNum)
 {
-    PS_ASSERT_PTR_NON_NULL(fpa, false);
+    PS_ASSERT_PTR_NON_NULL(fpa, -1);
 
     psArray *chips = fpa->chips;        // Component chips
@@ -580 +596 @@
                      )
 {
-    assert(chip);
+    PS_ASSERT_PTR_NON_NULL(chip, -1);
 
     psArray *cells = chip->cells;       // The component cells

trunk/psModules/src/camera/pmFPAHeader.c

@@ -56 +56 @@
                      )
 {
+    PS_ASSERT_PTR_NON_NULL(cell, false);
+    PS_ASSERT_PTR_NON_NULL(fits, false);
+
     if (!cell->hdu) {
         return pmChipReadHeader(cell->parent, fits);
@@ -72 +75 @@
                      )
 {
+    PS_ASSERT_PTR_NON_NULL(chip, false);
+    PS_ASSERT_PTR_NON_NULL(fits, false);
+
     if (!chip->hdu) {
         return pmFPAReadHeader(chip->parent, fits);
@@ -88 +94 @@
                     )
 {
+    PS_ASSERT_PTR_NON_NULL(fpa, false);
+    PS_ASSERT_PTR_NON_NULL(fits, false);
+
     if (!fpa->hdu) {
         return false;

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;