Changeset 12555 for trunk/psLib/src/fits/psFits.c

Timestamp:

Mar 22, 2007, 2:34:52 PM (19 years ago)

Author:

magnier

Message:

fixed memory leak in psFitsClose

File:

• trunk/psLib/src/fits/psFits.c (modified) (7 diffs)

trunk/psLib/src/fits/psFits.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.63 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-03-22 21:40:47 $
+ *  @version $Revision: 1.64 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-03-23 00:34:52 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -65 +65 @@
             return false;
         }
-    }
-
+        fits->fd = NULL;
+    }
     return true;
 }
@@ -72 +72 @@
 static void fitsFree(psFits* fits)
 {
-    (void)fitsClose(fits);
+    if (!fits) return;
+    if (fits->fd) {
+        fitsClose(fits);
+    }
+    psFree (fits->extword);
 }
 
@@ -84 +88 @@
 
     bool status = fitsClose(fits);
-    psMemSetDeallocator(fits,NULL);
     psFree(fits);
 
@@ -205 +208 @@
     PS_ASSERT_PTR_NON_NULL(extword, false);
 
-    int status = 0;
     int hdutype = 0;
     char name[MAX_STRING_LENGTH];
@@ -212 +214 @@
     for (int i = 1; true; i++) {
         // are we able to read the next HDU?
+
+        int status = 0;
         if (fits_movabs_hdu(fits->fd, i, &hdutype, &status)) {
             char fitsErr[MAX_STRING_LENGTH];
@@ -220 +224 @@
             return false;
         }
-        // is there a keyword called 'extword'?
-        if (fits_read_key_str(fits->fd, (char *)extword, name, NULL, &status)) {
+        // is there a keyword called 'extword'? (read as string regardless of type)
+        status = 0;
+        if (fits_read_keyword(fits->fd, (char *)extword, name, NULL, &status)) {
             continue;
         }