Changeset 9560 for trunk/psModules/src/objects/pmSourceIO.c

Timestamp:

Oct 13, 2006, 2:53:56 PM (20 years ago)

Author:

magnier

Message:

fixed error in freeing updates

File:

• trunk/psModules/src/objects/pmSourceIO.c (modified) (3 diffs)

trunk/psModules/src/objects/pmSourceIO.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-07 03:54:29 $
+ *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-14 00:53:56 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -207 +207 @@
         outhead = psMetadataCopy (NULL, hdu->header);
 
-        // copy over the entries saved in the
-        updates = psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.HEADER");
+        // copy over the entries saved by PSPHOT
+        updates = psMetadataLookupPtr (NULL, readout->analysis, "PSPHOT.HEADER");
         if (updates) {
             psMetadataCopy (outhead, updates);
-            psFree (updates);
-        }
-
-        updates = psMetadataLookupPtr (&status, readout->analysis, "PSASTRO.HEADER");
+        }
+
+        // copy over the entries saved by PSASTRO
+        updates = psMetadataLookupPtr (NULL, readout->analysis, "PSASTRO.HEADER");
         if (updates) {
             psMetadataCopy (outhead, updates);
-            psFree (updates);
         }
 
@@ -270 +269 @@
             // XXX : see note below about DVO/addstar expectations
             updates = psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.HEADER");
-            psMetadataCopy (outhead, updates);
+            if (updates) {
+                psMetadataCopy (outhead, updates);
+            }
+
+            updates = psMetadataLookupPtr (&status, readout->analysis, "PSASTRO.HEADER");
+            if (updates) {
+                psMetadataCopy (outhead, updates);
+            }
 
             psFitsWriteBlank (file->fits, outhead, headname);