From 04b9e2a433be08abc45d16a8fb6efd9bc346b856 Mon Sep 17 00:00:00 2001
From: mcmartin <mcmartin@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Sun, 11 May 2003 15:10:16 +0000
Subject: [PATCH] EventHandler checks CurStarDescPtr before dereference - fixes
 #347

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@955 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/ChangeLog             | 1 +
 sc2/src/sc2code/starcon.c | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/sc2/ChangeLog b/sc2/ChangeLog
index 99781d1ac..7882793eb 100644
--- a/sc2/ChangeLog
+++ b/sc2/ChangeLog
@@ -1,4 +1,5 @@
 Changes towards version 0.3:
+- EventHandler checks CurStarDescPtr before dereferencing it (bug #347)
 - Oscilloscope now has borders (bug #307 part 4) -Mika
 - Flashing rects are no longer constrained to even-numbered pixels on the
   y axis; fixes bug #255, from Nic
diff --git a/sc2/src/sc2code/starcon.c b/sc2/src/sc2code/starcon.c
index fb41da157..0eebe4772 100644
--- a/sc2/src/sc2code/starcon.c
+++ b/sc2/src/sc2code/starcon.c
@@ -681,6 +681,7 @@ EventHandler (BYTE selector)
 		case KOHR_AH_GENOCIDE_EVENT:
 			if (!GET_GAME_STATE (KOHR_AH_FRENZY)
 					&& LOBYTE (GLOBAL (CurrentActivity)) == IN_INTERPLANETARY
+			                && CurStarDescPtr
 					&& CurStarDescPtr->Index == SAMATRA_DEFINED)
 				AddEvent (RELATIVE_EVENT, 0, 7, 0, KOHR_AH_GENOCIDE_EVENT);
 			else
@@ -694,6 +695,7 @@ EventHandler (BYTE selector)
 			break;
 		case ZOQFOT_DISTRESS_EVENT:
 			if (LOBYTE (GLOBAL (CurrentActivity)) == IN_INTERPLANETARY
+			                && CurStarDescPtr
 					&& CurStarDescPtr->Index == ZOQFOT_DEFINED)
 				AddEvent (RELATIVE_EVENT, 0, 7, 0, ZOQFOT_DISTRESS_EVENT);
 			else
@@ -704,6 +706,7 @@ EventHandler (BYTE selector)
 			break;
 		case ZOQFOT_DEATH_EVENT:
 			if (LOBYTE (GLOBAL (CurrentActivity)) == IN_INTERPLANETARY
+			                && CurStarDescPtr
 					&& CurStarDescPtr->Index == ZOQFOT_DEFINED)
 				AddEvent (RELATIVE_EVENT, 0, 7, 0, ZOQFOT_DEATH_EVENT);
 			else if (GET_GAME_STATE (ZOQFOT_DISTRESS))
@@ -740,6 +743,7 @@ EventHandler (BYTE selector)
 			break;
 		case SPATHI_SHIELD_EVENT:
 			if (LOBYTE (GLOBAL (CurrentActivity)) == IN_INTERPLANETARY
+			                && CurStarDescPtr
 					&& CurStarDescPtr->Index == SPATHI_DEFINED)
 				AddEvent (RELATIVE_EVENT, 0, 7, 0, SPATHI_SHIELD_EVENT);
 			else