Changeset 9754

Timestamp:

Oct 26, 2006, 3:09:50 PM (20 years ago)

Author:

jhoblitt

Message:

fix psMetadataItemCopy() to handle NULL psTimes

File:

• trunk/psLib/src/types/psMetadata.c (modified) (2 diffs)

trunk/psLib/src/types/psMetadata.c

@@ -12 +12 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.145 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-25 00:16:33 $
+ *  @version $Revision: 1.146 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-27 01:09:50 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -377 +377 @@
         }
     case PS_DATA_TIME: {
-            psTime *timeCopy = psTimeCopy( (psTime*)(in->data.V) );
-            if (timeCopy == NULL) {
-                psError(PS_ERR_BAD_PARAMETER_NULL, false,
-                        "Error copying time.  Time skipped.\n");
-            } else {
-                newItem = psMetadataItemAlloc(in->name, PS_DATA_TIME, in->comment, timeCopy);
+            psTime *timeCopy = NULL;
+            // pass through NULL values
+            if (in->data.V) {
+                timeCopy = psTimeCopy( (psTime*)(in->data.V) );
+                if (timeCopy == NULL) {
+                    psError(PS_ERR_BAD_PARAMETER_NULL, false,
+                            "Error copying time.  Time skipped.\n");
+                }
+            }
+            newItem = psMetadataItemAlloc(in->name, PS_DATA_TIME, in->comment, timeCopy);
+            if (timeCopy) {
                 psFree(timeCopy);   // Drop reference
             }