Changeset 15523 for trunk/psLib/src/sys/psString.c

Timestamp:

Nov 8, 2007, 2:47:41 PM (19 years ago)

Author:

Paul Price

Message:

Adding some additional memory instrumentation. Adding warning about use of psStringAppend under certain conditions; can't trap all the dangerous uses, but can catch the really really dangerous ones.

File:

• trunk/psLib/src/sys/psString.c (modified) (6 diffs)

trunk/psLib/src/sys/psString.c

@@ -13 +13 @@
  *  @author David Robbins, MHPCC
  *
- *  @version $Revision: 1.59 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-11-08 04:22:23 $
+ *  @version $Revision: 1.60 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-11-09 00:47:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -144 +144 @@
     ssize_t         tailLength = 0;         // length of string to append
 
+    if (*dest && psMemGetRefCounter(*dest) > 1) {
+        psWarning("Appending to a string with multiple reference counts may corrupt memory!");
+    }
+
     if (*dest) {
         oldLength = strlen(*dest);
@@ -218 +222 @@
     char            *oldDest;           // copy of original string
 
+    if (*dest && psMemGetRefCounter(*dest) > 1) {
+        psWarning("Appending to a string with multiple reference counts may corrupt memory!");
+    }
+
     if (!*dest) {
         // makes the string backup and concatination pointless
@@ -270 +278 @@
 // NULL input string returns empty (not NULL) list
 // NULL splitters is an error
-psList *psStringSplit(const char *string,
-                      const char *splitters,
-                      bool multipleAreSignificant)
+psList *p_psStringSplit(const char *file,
+                        unsigned int lineno,
+                        const char *func,
+                        const char *string,
+                        const char *splitters,
+                        bool multipleAreSignificant)
 {
     PS_ASSERT_STRING_NON_EMPTY(splitters, NULL);
 
-    psList *values = psListAlloc(NULL); // The list of values to return
+    psList *values = p_psListAlloc(file, lineno, func, NULL); // The list of values to return
     // An input NULL string should not generate an error: it is a valid case
     if (string == NULL) {
@@ -293 +304 @@
 
         // Copy the current word
-        psString word = psStringNCopy(current, next - current);
+        psString word = p_psStringNCopy(file, lineno, func, current, next - current);
         psListAdd(values, PS_LIST_TAIL, word);
         psFree(word);
@@ -302 +313 @@
     if (strlen(current) > 0) {
         // Copy the last word
-        psString word = psStringCopy(current);
+        psString word = p_psStringCopy(file, lineno, func, current);
         (void)psListAdd(values, PS_LIST_TAIL, word);
         psFree(word);