From b2250788c7679fe0e9bcf2dec4ebd834446c5846 Mon Sep 17 00:00:00 2001
From: Hanicef <gustaf@hanicef.me>
Date: Sun, 19 May 2024 15:14:54 +0200
Subject: [PATCH] Fix segfault when using models
---
src/hardware/hw_md2.c | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c
index 4c4bd7362..feb84d995 100644
--- a/src/hardware/hw_md2.c
+++ b/src/hardware/hw_md2.c
@@ -494,15 +494,10 @@ void HWR_InitModels(void)
md2_nummodels = numspriteinfo;
md2_models = Z_Malloc(sizeof(*md2_models) * numspriteinfo, PU_STATIC, NULL);
+ memset(md2_models, 0, sizeof(*md2_models) * numspriteinfo);
for (i = 0; i < numspriteinfo; i++)
{
md2_models[i].scale = -1.0f;
- md2_models[i].model = NULL;
- md2_models[i].grpatch = NULL;
- md2_models[i].notexturefile = false;
- md2_models[i].noblendfile = false;
- md2_models[i].found = false;
- md2_models[i].error = false;
}
if (numsprites && numskins)
@@ -515,15 +510,10 @@ void HWR_AllocateMD2Model(void)
{
UINT32 i;
md2_models = Z_Realloc(md2_models, sizeof(*md2_models) * numspriteinfo, PU_STATIC, NULL);
+ memset(&md2_models[md2_nummodels], 0, sizeof(*md2_models) * (numspriteinfo - md2_nummodels));
for (i = md2_nummodels; i < numspriteinfo; i++)
{
md2_models[i].scale = -1.0f;
- md2_models[i].model = NULL;
- md2_models[i].grpatch = NULL;
- md2_models[i].notexturefile = false;
- md2_models[i].noblendfile = false;
- md2_models[i].found = false;
- md2_models[i].error = false;
}
md2_nummodels = numspriteinfo;
}
--
GitLab