Changeset 6132 for branches/eam_rel9_b1/psLib/src/sys/psString.c

Timestamp:

Jan 21, 2006, 1:44:37 PM (20 years ago)

Author:

magnier

Message:

adding patch from josh

File:

• branches/eam_rel9_b1/psLib/src/sys/psString.c (modified) (3 diffs)

branches/eam_rel9_b1/psLib/src/sys/psString.c

@@ -12 +12 @@
  *  @author Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.21.6.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-01-17 09:23:21 $
+ *  @version $Revision: 1.21.6.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-01-21 23:44:37 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -32 +32 @@
     // Copy input string to memory just allocated
     // Return the copy
-    return strcpy(psAlloc(strlen(string) + 1), string);
+    // Pass through NULL values
+    return string ? strcpy(psAlloc(strlen(string) + 1), string) : NULL;
 }
 
@@ -50 +51 @@
     // Copy input string to memory allocated up to nChar characters
     // Return the copy
-    returnValue = strncpy(psAlloc((size_t) nChar + 1), string, (size_t) nChar);
+    // Pass through NULL values
+    returnValue =
+              string ? strncpy(psAlloc((size_t) nChar + 1), string, (size_t) nChar)
+              : NULL;
 
     // Ensure the last byte is NULL character