From d98e1b9eb09dec59406cd863a8c2bcb2f33a3863 Mon Sep 17 00:00:00 2001
From: Yamagi Burmeister <yamagi@yamagi.org>
Date: Wed, 28 Dec 2016 18:04:14 +0100
Subject: [PATCH] Add some missing sanity checks.

This was reported by Maraakate in yquake2 issue #164.
---
 src/g_weapon.c          | 5 +++++
 src/monster/gekk/gekk.c | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/src/g_weapon.c b/src/g_weapon.c
index 9868e1a..d62a032 100644
--- a/src/g_weapon.c
+++ b/src/g_weapon.c
@@ -66,6 +66,11 @@ fire_hit(edict_t *self, vec3_t aim, int damage, int kick)
 		return false;
 	}
 
+	if (!self->enemy)
+	{
+		return false;
+	}
+
 	/* see if enemy is in range */
 	VectorSubtract(self->enemy->s.origin, self->s.origin, dir);
 	range = VectorLength(dir);
diff --git a/src/monster/gekk/gekk.c b/src/monster/gekk/gekk.c
index 8a78f57..dbe7b39 100644
--- a/src/monster/gekk/gekk.c
+++ b/src/monster/gekk/gekk.c
@@ -469,6 +469,11 @@ gekk_swim(edict_t *self)
 		return;
 	}
 
+	if (!self->enemy)
+	{
+		return;
+	}
+
 	if (!self->enemy->waterlevel && (random() > 0.7))
 	{
 		water_to_land(self);