Changeset 32746

Timestamp:

Nov 22, 2011, 10:17:57 AM (15 years ago)

Author:

eugene

Message:

if we catch a memory block over/underrun, check the rest of the memory for corruption

File:

• trunk/psLib/src/sys/psMemory.c (modified) (5 diffs)

trunk/psLib/src/sys/psMemory.c

@@ -100 +100 @@
     PS_MEM_ABORT(__func__, "Unsafe to Continue\n"); \
 }
+
+static bool checkingForCorruption = false;
 
 static bool isBadMemBlock(FILE *output, const psMemBlock *memBlock, const char *file, unsigned int lineo, const char *func);
@@ -746 +748 @@
         }
         fprintf(output, _("\n\tMemory block is corrupted; buffer underflow detected.\n"));
+        if (!checkingForCorruption) {
+          p_psMemCheckCorruption(__FILE__, __LINE__, __func__, output, false);
+        }
         bad = true;
     }
@@ -755 +760 @@
         }
         fprintf(output, _("\n\tMemory block is corrupted; buffer overflow detected.\n"));
+        if (!checkingForCorruption) {
+          p_psMemCheckCorruption(__FILE__, __LINE__, __func__, output, false);
+        }
         bad = true;
     }
@@ -1304 +1312 @@
     MUTEX_LOCK(&memBlockListMutex);
 
+    // this function calls 'isBadMemBlock', which may in turn call this function : avoid nested calls or we will be stuck forever
+    checkingForCorruption = true;
+
     psS32 nbad = 0;               // number of bad blocks
     for (psMemBlock *memBlock = (psMemBlock *) lastMemBlockAllocated; memBlock != NULL; memBlock = memBlock->nextBlock) {
@@ -1316 +1327 @@
         }
     }
+
+    checkingForCorruption = true;
 
     // release the lock on the memblock list