fly/flightgear
1
0
Fork 0
Code Activity

Fix crash in AI/Traffic code

Browse source 
Sentry-Id: FLIGHTGEAR-139
This commit is contained in:
James Turner 2021-02-04 16:11:08 +00:00
parent 2ae51b69b0
commit b915d02f55
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ATC/trafficcontrol.cxx
View file

@ -1264,6 +1264,7 @@ void FGStartupController::updateAircraftInformation(int id, double lat, double l
if (i == activeTraffic.end() || (activeTraffic.size() == 0)) { if (i == activeTraffic.end() || (activeTraffic.size() == 0)) {
SG_LOG(SG_ATC, SG_ALERT, SG_LOG(SG_ATC, SG_ALERT,
"AI error: updating aircraft without traffic record at " << SG_ORIGIN); "AI error: updating aircraft without traffic record at " << SG_ORIGIN);
return;
} else { } else {
i->setPositionAndHeading(lat, lon, heading, speed, alt); i->setPositionAndHeading(lat, lon, heading, speed, alt);
current = i; current = i;
@ -1273,7 +1274,8 @@ void FGStartupController::updateAircraftInformation(int id, double lat, double l
int state = i->getState(); int state = i->getState();
// Sentry FLIGHTGEAR-2Q : don't crash on null TrafficRef // Sentry FLIGHTGEAR-2Q : don't crash on null TrafficRef
if (!i->getAircraft()->getTrafficRef()) { // Sentry FLIGHTGEAR-129: don't crash on null aircraft
if (!i->getAircraft() || !i->getAircraft()->getTrafficRef()) {
SG_LOG(SG_ATC, SG_ALERT, "AI traffic: updating aircraft without traffic ref"); SG_LOG(SG_ATC, SG_ALERT, "AI traffic: updating aircraft without traffic ref");
return; return;
} }