qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-18 18:01:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

[zone] Be more informative when catching memory errors

Browse source 
The registered error handler is given a chance to report the error, and
the corrupted id is printed.
This commit is contained in:
Bill Currie 2022-02-12 01:57:03 +09:00
parent 1d26c727a3
commit fc8cc0b703
1 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
libs/util/zone.c
View file

@ -353,13 +353,22 @@ Z_Print (memzone_t *zone)
Sys_Printf ("ERROR: next block doesn't have proper back link\n");
if (!block->tag && !block->next->tag)
Sys_Printf ("ERROR: two consecutive free blocks\n");
if (block->tag
&& (*(int *) ((byte *) block + block->block_size - 4) != ZONEID))
Sys_Printf ("ERROR: memory trashed in block\n");
int id = *(int *) ((byte *) block + block->block_size - 4);
if (block->tag && (id != ZONEID))
Sys_Printf ("ERROR: memory trashed in block %x != %x\n",
id, ZONEID);
fflush (stdout);
}
}
static void
z_error (memzone_t *zone, const char *msg)
{
if (zone->error)
zone->error (zone->data, msg);
Sys_Error ("%s", msg);
}
void
Z_CheckHeap (memzone_t *zone)
{
@ -369,13 +378,24 @@ Z_CheckHeap (memzone_t *zone)
if (block->next == &zone->blocklist)
break; // all blocks have been hit
if ((byte *) block + block->block_size != (byte *) block->next)
Sys_Error ("Z_CheckHeap: block size does not touch the next "
"block\n");
z_error (zone,
"Z_CheckHeap: block size does not touch the next block");
if (block->next->prev != block)
Sys_Error ("Z_CheckHeap: next block doesn't have proper back "
"link\n");
z_error (zone,
"Z_CheckHeap: next block doesn't have proper back link");
if (!block->tag && !block->next->tag)
Sys_Error ("Z_CheckHeap: two consecutive free blocks\n");
z_error (zone, "Z_CheckHeap: two consecutive free blocks");
if (block->id != ZONEID/* || block->id2 != ZONEID*/)
z_error (zone, "ERROR: block ids incorrect");
if ((byte *) block + block->block_size != (byte *) block->next)
z_error (zone, "ERROR: block size does not touch the next block");
if (block->next->prev != block)
z_error (zone, "ERROR: next block doesn't have proper back link");
if (!block->tag && !block->next->tag)
z_error (zone, "ERROR: two consecutive free blocks");
if (block->tag
&& (*(int *) ((byte *) block + block->block_size - 4) != ZONEID))
z_error (zone, "ERROR: memory trashed in block");
}
}