summaryrefslogtreecommitdiffhomepage
path: root/Stars45/MsnPkgDlg.cpp
diff options
context:
space:
mode:
authorrhyskidd <rhyskidd@076cb2c4-205e-83fd-5cf3-1be9aa105544>2012-05-30 13:26:32 +0000
committerrhyskidd <rhyskidd@076cb2c4-205e-83fd-5cf3-1be9aa105544>2012-05-30 13:26:32 +0000
commiteaa453335563d670d856da44bf4ea1f332c618a7 (patch)
treea976bf3e0fc4b690042915745e637eb6b00929e4 /Stars45/MsnPkgDlg.cpp
parent035cfd86e5d221cffb2673e936dcb8703e28ce4b (diff)
downloadstarshatter-eaa453335563d670d856da44bf4ea1f332c618a7.zip
starshatter-eaa453335563d670d856da44bf4ea1f332c618a7.tar.gz
starshatter-eaa453335563d670d856da44bf4ea1f332c618a7.tar.bz2
Ensure check for NULL pointer occurs prior to use, not after
Diffstat (limited to 'Stars45/MsnPkgDlg.cpp')
-rw-r--r--Stars45/MsnPkgDlg.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Stars45/MsnPkgDlg.cpp b/Stars45/MsnPkgDlg.cpp
index 4d996bc..bfe8a6c 100644
--- a/Stars45/MsnPkgDlg.cpp
+++ b/Stars45/MsnPkgDlg.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: MsnPkgDlg.cpp
@@ -205,13 +205,13 @@ MsnPkgDlg::DrawThreats()
if (!mission) return;
MissionElement* player = mission->GetPlayer();
+
+ if (!player) return;
+
Text rgn0 = player->Region();
Text rgn1;
int iff = player->GetIFF();
- if (!player)
- return;
-
ListIter<Instruction> nav = player->NavList();
while (++nav) {
if (rgn0 != nav->RegionName())