Ticket #681: pslib-0.9.99-null_string_handling.patch

src/sys/psString.c

@@ -33 +33 @@
     // 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;
 }
 
 psString psStringNCopy(const char *string,
@@ -52 +53 @@
     // Allocate memory using psAlloc function - nChar bytes
     // 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
     returnValue[nChar] = '\0';

src/sys/psString.h

@@ -37 +37 @@
 
 /** 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
  */
@@ -54 +55 @@
  *  so if the input string is larger than nChar characters the copied
  *  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
  */

src/types/psMetadata.c

@@ -243 +243 @@
         break;
     case PS_DATA_STRING:
         // Perform copy of input strings
-        metadataItem->data.V = psStringNCopy(va_arg(argPtr, char *), MAX_STRING_LENGTH);
+        {
+            char *string = va_arg(argPtr, char *);
+            metadataItem->data.V =
+                          string ? psStringNCopy(string, MAX_STRING_LENGTH)
+                                 : NULL;
+        }
         break;
     case     PS_DATA_ARRAY:                     // psArray
     case     PS_DATA_BITSET:                    // psBitSet