From 9556cc0218943e1b541ecccb389ff94aa74ce12f Mon Sep 17 00:00:00 2001 From: divverent Date: Thu, 1 Jan 2009 17:01:49 +0000 Subject: [PATCH] also support entity lumps that are NOT NUL terminated git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@8616 d7cf8633-e32d-0410-b094-e92efae38249 --- model_brush.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/model_brush.c b/model_brush.c index 4512c541..ebd60e33 100644 --- a/model_brush.c +++ b/model_brush.c @@ -1835,8 +1835,9 @@ static void Mod_Q1BSP_LoadEntities(lump_t *l) loadmodel->brush.entities = NULL; if (!l->filelen) return; - loadmodel->brush.entities = (char *)Mem_Alloc(loadmodel->mempool, l->filelen); + loadmodel->brush.entities = (char *)Mem_Alloc(loadmodel->mempool, l->filelen + 1); memcpy(loadmodel->brush.entities, mod_base + l->fileofs, l->filelen); + loadmodel->brush.entities[l->filelen] = 0; if (loadmodel->brush.ishlbsp) Mod_Q1BSP_ParseWadsFromEntityLump(loadmodel->brush.entities); } @@ -4167,8 +4168,9 @@ static void Mod_Q3BSP_LoadEntities(lump_t *l) loadmodel->brushq3.num_lightgrid_cellsize[2] = 128; if (!l->filelen) return; - loadmodel->brush.entities = (char *)Mem_Alloc(loadmodel->mempool, l->filelen); + loadmodel->brush.entities = (char *)Mem_Alloc(loadmodel->mempool, l->filelen + 1); memcpy(loadmodel->brush.entities, mod_base + l->fileofs, l->filelen); + loadmodel->brush.entities[l->filelen] = 0; data = loadmodel->brush.entities; // some Q3 maps override the lightgrid_cellsize with a worldspawn key if (data && COM_ParseToken_Simple(&data, false, false) && com_token[0] == '{') -- 2.39.2