Changeset 15524

Timestamp:

Nov 8, 2007, 2:48:09 PM (19 years ago)

Author:

Paul Price

Message:

Should only allocate as much memory for string as is required.

File:

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

trunk/psLib/src/types/psMetadata.c

@@ -12 +12 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.164 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-11-08 04:22:53 $
+ *  @version $Revision: 1.165 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-11-09 00:48:09 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -273 +273 @@
         metadataItem->data.F64 = (psF64)va_arg(argPtr, psF64);
         break;
-    case PS_DATA_STRING:
-        // Perform copy of input strings
-        {
-            char *string = va_arg(argPtr, char *);
-            metadataItem->data.str = string ? psStringNCopy(string, MAX_STRING_SIZE) : NULL;
-        }
+    case PS_DATA_STRING: {
+        // Copy input strings, so they can be messed with
+        char *string = va_arg(argPtr, char*);
+        metadataItem->data.str = (string ? p_psStringCopy(file, lineno, func, string) : NULL);
         break;
+    }
     case     PS_DATA_ARRAY:                     // psArray
     case     PS_DATA_BITSET:                    // psBitSet
@@ -319 +318 @@
         psFree(metadataItem);
         metadataItem = NULL;
+        break;
     }