diff options
| author | rhyskidd <rhyskidd@076cb2c4-205e-83fd-5cf3-1be9aa105544> | 2012-05-30 13:26:32 +0000 |
|---|---|---|
| committer | rhyskidd <rhyskidd@076cb2c4-205e-83fd-5cf3-1be9aa105544> | 2012-05-30 13:26:32 +0000 |
| commit | eaa453335563d670d856da44bf4ea1f332c618a7 (patch) | |
| tree | a976bf3e0fc4b690042915745e637eb6b00929e4 /Stars45/CampaignMissionFighter.cpp | |
| parent | 035cfd86e5d221cffb2673e936dcb8703e28ce4b (diff) | |
| download | starshatter-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/CampaignMissionFighter.cpp')
| -rw-r--r-- | Stars45/CampaignMissionFighter.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
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;
|