Changeset 227

Timestamp:

Mar 12, 2004, 3:10:01 PM (22 years ago)

Author:

rhl

Message:

Allow memory.c to use malloc/realloc/free; don't try to free bad pointers

File:

• trunk/archive/pslib/src/Utils/memory.c (modified) (2 diffs)

trunk/archive/pslib/src/Utils/memory.c

@@ -4 +4 @@
 #include "psUtils.h"
 #include "Private/p_psMemory.h"
+
+#undef malloc                           // _We_ are allowed to call these
+#undef realloc
+#undef free
 
 #undef psAlloc                          // don't get the __FILE__ versions
@@ -292 +296 @@
     }
 
-    if (bad_memblock(ptr, 0) || ptr->refCounter != 1) {
-        memProblemCB(ptr, file, lineno);
-    }
-
-    ptr->refCounter--;
-    memBlocks[ptr->id] = NULL;          // XXX sub-optimal! Can't check
-                                        // freed blocks for corruption
-    free(ptr);
+    if (bad_memblock(ptr, 0)) {
+        memProblemCB(ptr, file, lineno); // we may not own this block; don't free it
+    } else {
+        if (ptr->refCounter != 1) {
+            memProblemCB(ptr, file, lineno);
+        }
+        ptr->refCounter--;
+        memBlocks[ptr->id] = NULL;      // XXX sub-optimal! Can't check
+                                        // freed blocks for corruption
+        free(ptr);
+    }
 }