fly/flightgear
1
0
Fork 0
Code Activity

Guard against crash reported by Sentry

Browse source 
Avoid inserting null FGPositioned entries into the recent items
list, since this causes a crash in the model code

Sentry-Id: FLIGHTGEAR-1BM
This commit is contained in:
James Turner 2021-01-01 22:29:55 +00:00
parent 6b6defbead
commit f45f41d4ec
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/GUI/LocationController.cxx
View file

@ -381,12 +381,22 @@ void LocationController::showHistoryInSearchModel()
locs.erase(it, locs.end()); locs.erase(it, locs.end());
// prepend them // prepend them
FGAirportRef apt = FGAirport::findByIdent(tutorialICAO); FGAirportRef apt = FGAirport::findByIdent(tutorialICAO);
locs.insert(locs.begin(), apt); if (apt) {
locs.insert(locs.begin(), apt);
} else {
qWarning() << Q_FUNC_INFO << "couldn't find tutorial airport for:" << QString::fromStdString(tutorialICAO);
}
apt = FGAirport::findByIdent(defaultICAO); apt = FGAirport::findByIdent(defaultICAO);
locs.insert(locs.begin(), apt); if (apt) {
locs.insert(locs.begin(), apt);
} else {
qWarning() << Q_FUNC_INFO << "couldn't find default airport for:" << QString::fromStdString(defaultICAO);
}
// Sentry FLIGHTGEAR-1BM indicates we are somtimes passing null pointers
// in this list; checks above are an attempt to diagnose this.
m_searchModel->setItems(locs); m_searchModel->setItems(locs);
} }
@ -1155,6 +1165,12 @@ QString LocationController::description() const
void LocationController::addToRecent(FGPositionedRef pos) void LocationController::addToRecent(FGPositionedRef pos)
{ {
if (!pos) {
// ensure null positiones don't get added, could cause
// Sentry FLIGHTGEAR-1BM
return;
}
auto it = std::find(m_recentLocations.begin(), auto it = std::find(m_recentLocations.begin(),
m_recentLocations.end(), pos); m_recentLocations.end(), pos);
if (it != m_recentLocations.end()) { if (it != m_recentLocations.end()) {