Changeset 71 for trunk/src/helpers/xstring.c

Timestamp:

May 22, 2001, 7:18:41 PM (24 years ago)

Author:

umoeller

Message:

misc updates

File:

• trunk/src/helpers/xstring.c (modified) (4 diffs)

trunk/src/helpers/xstring.c

@@ -285 +285 @@
  *@@added V0.9.7 (2001-01-07) [umoeller]
  *@@changed V0.9.9 (2001-03-09) [umoeller]: now using ulDelta
+ *@@changed V0.9.12 (2001-05-21) [umoeller]: now reporting error on realloc fail
  */
 
@@ -318 +319 @@
         // this gives the C runtime a chance to expand the
         // existing block
-        pxstr->psz = (PSZ)realloc(pxstr->psz, cbAllocate);
+        if (pxstr->psz = (PSZ)realloc(pxstr->psz, cbAllocate))
                     // if pxstr->psz is NULL, realloc behaves like malloc
-        pxstr->cbAllocated = cbAllocate;
+            pxstr->cbAllocated = cbAllocate;
                 // ulLength is unchanged
+        else
+            // error: V0.9.12 (2001-05-21) [umoeller]
+            pxstr->cbAllocated = 0;
     }
     // else: we have enough memory
@@ -448 +452 @@
  *@@changed V0.9.9 (2001-02-16) [umoeller]: now supporting non-zero-terminated pcszSource
  *@@changed V0.9.9 (2001-03-09) [umoeller]: now using xstrReserve
+ *@@changed V0.9.12 (2001-05-21) [umoeller]: added xstrReserve error checking
  */
 
@@ -470 +475 @@
     {
         // we do have a source string:
-        xstrReserve(pxstr,
-                    // required memory:
-                    ulSourceLength + 1);
-
-        memcpy(pxstr->psz,
-               pcszSource,
-               ulSourceLength);
-        *(pxstr->psz + ulSourceLength) = '\0';
-                // V0.9.9 (2001-02-16) [umoeller]
-                // we must do this or otherwise we require pcszSource
-                // to be zero-terminated... not a good idea
+        if (xstrReserve(pxstr,
+                        // required memory:
+                        ulSourceLength + 1))
+        {
+            memcpy(pxstr->psz,
+                   pcszSource,
+                   ulSourceLength);
+            *(pxstr->psz + ulSourceLength) = '\0';
+                    // V0.9.9 (2001-02-16) [umoeller]
+                    // we must do this or otherwise we require pcszSource
+                    // to be zero-terminated... not a good idea
+        }
+        else
+            pxstr->ulLength = 0;        // error V0.9.12 (2001-05-21) [umoeller]
     }
     else