From 3ad60a0fa1af834b13a73051bf5cd535ee83b74a Mon Sep 17 00:00:00 2001 From: Valery Klachkov Date: Sat, 16 Jul 2022 13:59:41 +0000 Subject: [PATCH] engine: fix uninitialized variable in demo parsing code, fix incorrect size counter in memory allocator --- engine/client/cl_demo.c | 2 +- engine/common/zone.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/engine/client/cl_demo.c b/engine/client/cl_demo.c index 7443d51b..92ebdd2b 100644 --- a/engine/client/cl_demo.c +++ b/engine/client/cl_demo.c @@ -888,7 +888,7 @@ qboolean CL_DemoReadMessage( byte *buffer, size_t *length ) qboolean swallowmessages = true; static int tdlastdemoframe = 0; byte *userbuf = NULL; - size_t size; + size_t size = 0; byte cmd; if( !cls.demofile ) diff --git a/engine/common/zone.c b/engine/common/zone.c index f3200ed1..4ca83f65 100644 --- a/engine/common/zone.c +++ b/engine/common/zone.c @@ -91,8 +91,8 @@ void *_Mem_Alloc( poolhandle_t poolptr, size_t size, qboolean clear, const char pool->totalsize += size; // big allocations are not clumped - pool->realsize += sizeof( memheader_t ) + size + sizeof( int ); - mem = (memheader_t *)Q_malloc( sizeof( memheader_t ) + size + sizeof( int )); + pool->realsize += sizeof( memheader_t ) + size + sizeof( size_t ); + mem = (memheader_t *)Q_malloc( sizeof( memheader_t ) + size + sizeof( size_t )); if( mem == NULL ) Sys_Error( "Mem_Alloc: out of memory (alloc at %s:%i)\n", filename, fileline ); mem->filename = filename; @@ -162,7 +162,7 @@ static void Mem_FreeBlock( memheader_t *mem, const char *filename, int fileline // memheader has been unlinked, do the actual free now pool->totalsize -= mem->size; - pool->realsize -= sizeof( memheader_t ) + mem->size + sizeof( int ); + pool->realsize -= sizeof( memheader_t ) + mem->size + sizeof( size_t ); Q_free( mem ); }