Changeset 27000

Timestamp:

Feb 18, 2010, 6:18:20 PM (16 years ago)

Author:

Paul Price

Message:

Check return value of psFitsClose.

Location:

trunk/psModules/src/camera

Files:

• pmFPAfile.c (modified) (2 diffs)
• pmFPAfileDefine.c (modified) (2 diffs)

trunk/psModules/src/camera/pmFPAfile.c

@@ -28 +28 @@
     }
 
+    psAssert(file->fits == NULL, "File %s wasn't closed.", file->name);
+
     psTrace ("pmFPAfileFree", 5, "freeing %s\n", file->name);
     psFree (file->fpa);
@@ -40 +42 @@
     psFree (file->name);
 
-    if (file->fits != NULL) {
-        psFitsClose (file->fits);
-    }
     psFree(file->compression);
     psFree(file->options);

trunk/psModules/src/camera/pmFPAfileDefine.c

@@ -461 +461 @@
             return NULL;
         }
-        psFitsClose(fits);
+        if (!psFitsClose(fits)) {
+            psError(psErrorCodeLast(), false, "Failed to close file %s", realName);
+            psFree(realName);
+            return NULL;
+        }
 
         // Determine the current format from the header; determine camera if not specified already.
@@ -541 +545 @@
             }
             phu = psFitsReadHeader(NULL, fits);
-            psFitsClose(fits);
+            if (!psFitsClose(fits)) {
+                psError(psErrorCodeLast(), false, "Failed to close file %s", realName);
+                psFree(realName);
+                return NULL;
+            }
             if (!phu) {
                 psError(PS_ERR_IO, false, "Failed to read file header %s", realName);