]> git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - zone.c
Fix two memory allocation issues
[xonotic/darkplaces.git] / zone.c
diff --git a/zone.c b/zone.c
index 1fb9da3931f4a0d6ba576ab9e45307c035230f3e..dce455d126ff16f852486e920d384de3b345c3fc 100644 (file)
--- a/zone.c
+++ b/zone.c
@@ -397,8 +397,7 @@ void *_Mem_Alloc(mempool_t *pool, void *olddata, size_t size, size_t alignment,
        //if (developer.integer > 0 && developer_memorydebug.integer)
        //      _Mem_CheckSentinelsGlobal(filename, fileline);
        pool->totalsize += size;
-       // calculate the smallest realsize that is a multiple of alignment
-       realsize = (sizeof(memheader_t) + size + sizeof(sentinel2) + (alignment-1)) & ~(alignment-1);
+       realsize = alignment + sizeof(memheader_t) + size + sizeof(sentinel2);
        pool->realsize += realsize;
        base = (unsigned char *)Clump_AllocBlock(realsize);
        if (base == NULL)