Changeset 6278 for trunk/psLib/src/sys

Timestamp:

Feb 1, 2006, 10:40:56 AM (20 years ago)

Author:

drobbin

Message:

Added error handling to psString for NULL string inputs.

Location:

trunk/psLib/src/sys

Files:

• psString.c (modified) (6 diffs)
• psString.h (modified) (3 diffs)

trunk/psLib/src/sys/psString.c

@@ -13 +13 @@
  *  @author David Robbins, MHPCC
  *
- *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-01-27 01:49:05 $
+ *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-01 20:40:56 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -31 +31 @@
 psString psStringCopy(const char *string)
 {
+    PS_ASSERT_PTR_NON_NULL(string, NULL);
     // Allocate memory using psAlloc function
     // 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;
 }
 
@@ -40 +42 @@
                        unsigned int nChar)
 {
+    PS_ASSERT_PTR_NON_NULL(string, NULL);
     char *returnValue = NULL;
 
@@ -53 +56 @@
     // 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
@@ -66 +72 @@
                        ...)
 {
+    PS_ASSERT_PTR_NON_NULL(format, 0);
     va_list         args;
     size_t          length;             // complete string length (sans \0)
@@ -113 +120 @@
                         ...)
 {
+    PS_ASSERT_PTR_NON_NULL(format, 0);
     va_list         args;
     size_t          length;             // complete string length (sans \0)

trunk/psLib/src/sys/psString.h

@@ -14 +14 @@
  *  @author David Robbins, MHPCC
  *
- *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-01-26 05:31:54 $
+ *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-01 20:40:56 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -38 +38 @@
 /** Copies the input string
  *
- *  This function shall allocate memory to the length of the input string
- *  plus one and copy the input string to the newly allocated memory.
+ *  This function shall allocate memory to the length of the input string plus
+ *  one and copy the input string to the newly allocated memory.  If 'string'
+ *  is 'NULL' then 'NULL' is returned.
  *
  *  @return psString:      Copy of input string
@@ -55 +56 @@
  *  string will be a substring of the input string.  If the input string
  *  is smaller than nChar bytes then the remaining bytes allocated will
- *  be set to NULL.
+ *  be set to NULL.  If 'string' is 'NULL' then 'NULL' is returned.
  *
  *  @return  psString:   Copy of input string