From 98c4b34530d5a8e2f1b72fd9e94fe8247196b45b Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Sat, 23 Dec 2023 00:25:19 -0800
Subject: [PATCH] Fix dereferncing Broly null pointer

---
 src/k_collide.cpp     | 6 ++++--
 src/objects/broly.cpp | 5 +++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/k_collide.cpp b/src/k_collide.cpp
index 8c4a0c078..e5be87ce0 100644
--- a/src/k_collide.cpp
+++ b/src/k_collide.cpp
@@ -875,8 +875,10 @@ boolean K_InstaWhipCollide(mobj_t *shield, mobj_t *victim)
 				attackerPlayer->flashing = 0;
 
 				// Localized broly for a local event.
-				mobj_t *broly = Obj_SpawnBrolyKi(victim, victimHitlag);
-				broly->extravalue2 = 16*mapobjectscale;
+				if (mobj_t *broly = Obj_SpawnBrolyKi(victim, victimHitlag))
+				{
+					broly->extravalue2 = 16*mapobjectscale;
+				}
 
 				P_PlayVictorySound(victim);
 
diff --git a/src/objects/broly.cpp b/src/objects/broly.cpp
index fe2f43726..a7c589d6c 100644
--- a/src/objects/broly.cpp
+++ b/src/objects/broly.cpp
@@ -22,6 +22,11 @@ Obj_SpawnBrolyKi
 {
 	Broly* x = Broly::spawn<Broly>(static_cast<Mobj*>(source), duration, {64 * mapobjectscale, 0});
 
+	if (!x)
+	{
+		return nullptr;
+	}
+
 	x->colorized = true;
 	x->color = source->color;