From a8c658b545e3c7709212a43489163f33ffbe91f0 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Tue, 1 Feb 2022 04:04:53 -0800
Subject: [PATCH] Never spawn MT_NULL
---
src/p_mobj.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 87e20fd4ac..ca5c03ed02 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -10481,7 +10481,17 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
const mobjinfo_t *info = &mobjinfo[type];
SINT8 sc = -1;
state_t *st;
- mobj_t *mobj = Z_Calloc(sizeof (*mobj), PU_LEVEL, NULL);
+ mobj_t *mobj;
+
+ if (type == MT_NULL)
+ {
+#ifdef PARANOIA
+ I_Error("Tried to spawn MT_NULL\n");
+#endif
+ return NULL;
+ }
+
+ mobj = Z_Calloc(sizeof (*mobj), PU_LEVEL, NULL);
// this is officially a mobj, declared as soon as possible.
mobj->thinker.function.acp1 = (actionf_p1)P_MobjThinker;
--
GitLab