Changeset 7515 for trunk/psModules/src/camera/pmFPAConstruct.c

Timestamp:

Jun 11, 2006, 10:53:01 AM (20 years ago)

Author:

magnier

Message:

adding error checks to processContents results

File:

• trunk/psModules/src/camera/pmFPAConstruct.c (modified) (3 diffs)

trunk/psModules/src/camera/pmFPAConstruct.c

@@ -577 +577 @@
     }
 
+    // is FPAname already defined, new name must match it
+    // XXX if not, is it an error?
     const char *currentFPAname = psMetadataLookupStr(&mdok, fpa->concepts, "FPA.NAME"); // Current name
     if (mdok && currentFPAname && strlen(currentFPAname) > 0 && strcmp(currentFPAname, newFPAname) != 0) {
@@ -694 +696 @@
         psFree(chipName);
 
-        processContents(fpa, chip, cell, phdu, level, content, format);
+        if (processContents(fpa, chip, cell, phdu, level, content, format) < 0) {
+            psError(PS_ERR_IO, false, "Error setting CONTENTS");
+            psFree(phdu);
+            psFree(view);
+            return NULL;
+        }
         psFree(phdu);
         return view;
@@ -758 +765 @@
         hdu->format = psMemIncrRefCounter(format);
 
-        processContents(fpa, chip, cell, hdu, level, contentsItem->data.V, format);
+        if (processContents(fpa, chip, cell, hdu, level, contentsItem->data.V, format) < 0) {
+            psError(PS_ERR_IO, false, "Error setting CONTENTS");
+            psFree(view);
+            psFree(hdu);
+            psFree(contentsIter);
+            return NULL;
+        }
         psFree(hdu);
     }