From eaa453335563d670d856da44bf4ea1f332c618a7 Mon Sep 17 00:00:00 2001 From: rhyskidd Date: Wed, 30 May 2012 13:26:32 +0000 Subject: Ensure check for NULL pointer occurs prior to use, not after --- Stars45/CampaignMissionFighter.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'Stars45/CampaignMissionFighter.cpp') diff --git a/Stars45/CampaignMissionFighter.cpp b/Stars45/CampaignMissionFighter.cpp index 7475cb0..002dae7 100644 --- a/Stars45/CampaignMissionFighter.cpp +++ b/Stars45/CampaignMissionFighter.cpp @@ -784,13 +784,18 @@ CampaignMissionFighter::CreatePatrols() StarSystem* system = mission->GetStarSystem(); CombatGroup* base = squadron->FindCarrier(); + + if (!base) + continue; + OrbitalRegion* region = system->FindRegion(base->GetRegion()); + + if (!region) + continue; + int patrol_type = Mission::PATROL; Point base_loc; - if (!base || !region) - continue; - if (region->Type() == Orbital::TERRAIN) { patrol_type = Mission::AIR_PATROL; -- cgit v1.1