don't allocate packetlog entries if there is nothing to put in them -

[xonotic/darkplaces.git] / zone.c

diff --git a/zone.c b/zone.c
index 0895f522649e83c6b634fa2f839798ff01fe442a..0274e0665573ac6a65f378932db59f69c83a5cc7 100644 (file)
--- a/zone.c
+++ b/zone.c
@@ -204,7 +204,10 @@ static void _Mem_FreeBlock(memheader_t *mem, const char *filename, int fileline)
 void _Mem_Free(void *data, const char *filename, int fileline)
 {
        if (data == NULL)
-               Sys_Error("Mem_Free: data == NULL (called at %s:%i)", filename, fileline);
+       {
+               Con_DPrintf("Mem_Free: data == NULL (called at %s:%i)", filename, fileline);
+               return;
+       }
 
        if (developer.integer && developer_memorydebug.integer)
        {
@@ -411,7 +414,7 @@ void *Mem_ExpandableArray_AllocRecord(memexpandablearray_t *l)
                        {
                                memexpandablearray_array_t *oldarrays = l->arrays;
                                l->maxarrays = max(l->maxarrays * 2, 128);
-                               l->arrays = Mem_Alloc(l->mempool, l->maxarrays * sizeof(*l->arrays));
+                               l->arrays = (memexpandablearray_array_t*) Mem_Alloc(l->mempool, l->maxarrays * sizeof(*l->arrays));
                                if (oldarrays)
                                {
                                        memcpy(l->arrays, oldarrays, l->numarrays * sizeof(*l->arrays));
@@ -419,7 +422,7 @@ void *Mem_ExpandableArray_AllocRecord(memexpandablearray_t *l)
                                }
                        }
                        l->arrays[i].numflaggedrecords = 0;
-                       l->arrays[i].data = Mem_Alloc(l->mempool, (l->recordsize + 1) * l->numrecordsperarray);
+                       l->arrays[i].data = (unsigned char *) Mem_Alloc(l->mempool, (l->recordsize + 1) * l->numrecordsperarray);
                        l->arrays[i].allocflags = l->arrays[i].data + l->recordsize * l->numrecordsperarray;
                        l->numarrays++;
                }