From 66a6438de1ea41945f3fd774d858976679e309e0 Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Sun, 23 Sep 2012 23:07:00 +0100
Subject: [PATCH] Avoid a segfault-on-null
This code is called both when there's no ground-net, but also when there's no parking data at all.
---
src/AIModel/AIFlightPlanCreate.cxx | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/AIModel/AIFlightPlanCreate.cxx b/src/AIModel/AIFlightPlanCreate.cxx
index a9dfb15fe..80629ac28 100644
--- a/src/AIModel/AIFlightPlanCreate.cxx
+++ b/src/AIModel/AIFlightPlanCreate.cxx
@@ -355,9 +355,11 @@ void FGAIFlightPlan::createDefaultLandingTaxi(FGAIAircraft * ac,
pushBackWaypoint(wpt);
FGParking* parkPos = aAirport->getDynamics()->getParking(gateId);
- wpt = createOnGround(ac, "ENDtaxi", parkPos->getGeod(), airportElev,
+ if (parkPos) {
+ wpt = createOnGround(ac, "ENDtaxi", parkPos->getGeod(), airportElev,
ac->getPerformance()->vTaxi());
- pushBackWaypoint(wpt);
+ pushBackWaypoint(wpt);
+ }
}
bool FGAIFlightPlan::createLandingTaxi(FGAIAircraft * ac, FGAirport * apt,