From eaa453335563d670d856da44bf4ea1f332c618a7 Mon Sep 17 00:00:00 2001
From: rhyskidd <rhyskidd@076cb2c4-205e-83fd-5cf3-1be9aa105544>
Date: Wed, 30 May 2012 13:26:32 +0000
Subject: Ensure check for NULL pointer occurs prior to use, not after

---
 Stars45/ShipAI.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'Stars45/ShipAI.cpp')

diff --git a/Stars45/ShipAI.cpp b/Stars45/ShipAI.cpp
index f64f8bc..27e12d3 100644
--- a/Stars45/ShipAI.cpp
+++ b/Stars45/ShipAI.cpp
@@ -1,6 +1,6 @@
 /*  Project Starshatter 5.0
 	Destroyer Studios LLC
-	Copyright © 1997-2007. All Rights Reserved.
+	Copyright (C) 1997-2007. All Rights Reserved.
 
 	SUBSYSTEM:    Stars.exe
 	FILE:         ShipAI.cpp
@@ -104,7 +104,8 @@ ShipAI::SetWard(Ship* s)
 	if (s == ship->GetWard())
 	return;
 
-	ship->SetWard(s);
+    if (ship)
+        ship->SetWard(s);
 
 	Point form = RandomDirection();
 	form.SwapYZ();
-- 
cgit v1.1