Changeset 175

Timestamp:

Mar 9, 2004, 3:03:07 PM (22 years ago)

Author:

rhl

Message:

Call memFreeCB() before checking for memory problems

File:

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

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

@@ -82 +82 @@
 
     if (lineno > 0) {
-        psAbort(__func__, "Detected memory corruption at %s:%d", file, lineno);
+        psAbort(__func__, "Detected a problem in the memory system at %s:%d", file, lineno);
     }
 }
@@ -285 +285 @@
 
     psMemBlock *ptr = ((psMemBlock *)vptr) - 1;
+    /*
+     * Did the user ask to be informed about this deallocation?
+     */
+    if (ptr->id == p_psMemFreeID) {
+        p_psMemFreeID += memFreeCB(ptr);        
+    }
 
     if (bad_memblock(ptr, 0) || ptr->refCounter != 1) {
         memProblemCB(ptr, file, lineno);
-    }
-    /*
-     * Did the user ask to be informed about this allocation?
-     */
-    if(ptr->id == p_psMemFreeID) {
-        p_psMemFreeID += memFreeCB(ptr);        
     }