fly/flightgear
1
0
Fork 0
Code Activity

Traffic: harden RunwayGroup::setActive

Browse source 
When incorrect rwyprefs.XML input is provided, don’t crash in this
method, just skip the incomplete entries.

Ticket: https://sourceforge.net/p/flightgear/codetickets/2439/
This commit is contained in:
James Turner 2020-12-02 12:38:29 +00:00
parent 602360cdeb
commit 7279b51785
2 changed files with 152 additions and 120 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

267
src/Airports/runwayprefs.cxx
View file

@ -21,10 +21,9 @@
// //
// $Id$ // $Id$
#ifdef HAVE_CONFIG_H #include <config.h>
# include <config.h>
#endif
#include <algorithm>
#include <cmath> #include <cmath>
#include <cstdlib> #include <cstdlib>
#include <cstring> #include <cstring>
@ -197,7 +196,6 @@ void RunwayGroup::setActive(const FGAirport * airport,
double maxTail, double maxTail,
double maxCross, stringVec * currentlyActive) double maxCross, stringVec * currentlyActive)
{ {
FGRunway *rwy; FGRunway *rwy;
int activeRwys = rwyList.size(); // get the number of runways active int activeRwys = rwyList.size(); // get the number of runways active
int nrOfPreferences; int nrOfPreferences;
@ -210,121 +208,145 @@ void RunwayGroup::setActive(const FGAirport * airport,
//stringVec names; //stringVec names;
int bestMatch = 0, bestChoice = 0; int bestMatch = 0, bestChoice = 0;
if (activeRwys > 0) { if (activeRwys == 0) {
// Now downward iterate across all the possible preferences active = -1;
// starting by the least preferred choice working toward the most preferred choice nrActive = 0;
return;
}
nrOfPreferences = rwyList[0].getRwyList()->size(); // Now downward iterate across all the possible preferences
bool validSelection = true; // starting by the least preferred choice working toward the most preferred choice
bool foundValidSelection = false;
for (int i = nrOfPreferences - 1; i >= 0; i--) { nrOfPreferences = rwyList[0].getPreferredRunways().size();
int match = 0; bool validSelection = true;
bool foundValidSelection = false;
for (int i = nrOfPreferences - 1; i >= 0; i--) {
int match = 0;
// Test each runway listed in the preference to see if it's possible to use // Test each runway listed in the preference to see if it's possible to use
// If one runway of the selection isn't allowed, we need to exclude this // If one runway of the selection isn't allowed, we need to exclude this
// preference, however, we don't want to stop right there, because we also // preference, however, we don't want to stop right there, because we also
// don't want to randomly swap runway preferences, unless there is a need to. // don't want to randomly swap runway preferences, unless there is a need to.
// //
validSelection = true; validSelection = true;
for (int j = 0; j < activeRwys; j++) { for (int j = 0; j < activeRwys; j++) {
std::string ident(rwyList[j].getRwyList(i)); const auto& currentRunwayPrefs = rwyList.at(j).getPreferredRunways();
if (!airport->hasRunwayWithIdent(ident)) {
SG_LOG(SG_GENERAL, SG_WARN,
"no such runway:" << ident << " at " <<
airport->ident());
continue;
}
rwy = airport->getRunwayByIdent(ident); // if this rwyList has shorter preferences vec than the first one,
// don't crash accesing an invalid index.
// see https://sourceforge.net/p/flightgear/codetickets/2439/
if (currentRunwayPrefs.size() <= i) {
validSelection = false;
continue;
}
//cerr << "Succes" << endl; const auto& ident(currentRunwayPrefs.at(i));
hdgDiff = fabs(windHeading - rwy->headingDeg()); if (!airport->hasRunwayWithIdent(ident)) {
name = rwy->name(); SG_LOG(SG_GENERAL, SG_WARN,
"no such runway:" << ident << " at " << airport->ident());
validSelection = false;
continue;
}
rwy = airport->getRunwayByIdent(ident);
//cerr << "Succes" << endl;
hdgDiff = fabs(windHeading - rwy->headingDeg());
name = rwy->name();
if (hdgDiff > 180) if (hdgDiff > 180)
hdgDiff = 360 - hdgDiff; hdgDiff = 360 - hdgDiff;
//cerr << "Heading diff: " << hdgDiff << endl; //cerr << "Heading diff: " << hdgDiff << endl;
hdgDiff *= ((2 * M_PI) / 360.0); // convert to radians hdgDiff *= ((2 * M_PI) / 360.0); // convert to radians
crossWind = windSpeed * sin(hdgDiff); crossWind = windSpeed * sin(hdgDiff);
tailWind = -windSpeed * cos(hdgDiff); tailWind = -windSpeed * cos(hdgDiff);
//cerr << "Runway : " << rwy->name() << ": " << rwy->headingDeg() << endl; //cerr << "Runway : " << rwy->name() << ": " << rwy->headingDeg() << endl;
//cerr << ". Tailwind : " << tailWind; //cerr << ". Tailwind : " << tailWind;
//cerr << ". Crosswnd : " << crossWind; //cerr << ". Crosswnd : " << crossWind;
if ((tailWind > maxTail) || (crossWind > maxCross)) { if ((tailWind > maxTail) || (crossWind > maxCross)) {
//cerr << ". [Invalid] " << endl; //cerr << ". [Invalid] " << endl;
validSelection = false; validSelection = false;
} else { } else {
//cerr << ". [Valid] "; //cerr << ". [Valid] ";
} }
//cerr << endl; //cerr << endl;
for (stringVecIterator it = currentlyActive->begin(); for (stringVecIterator it = currentlyActive->begin();
it != currentlyActive->end(); it++) { it != currentlyActive->end(); it++) {
//cerr << "Checking : \"" << (*it) << "\". vs \"" << name << "\"" << endl; //cerr << "Checking : \"" << (*it) << "\". vs \"" << name << "\"" << endl;
if ((*it) == name) { if ((*it) == name) {
match++; match++;
}
}
} // of active runways iteration
if (validSelection) {
//cerr << "Valid selection : " << i << endl;;
foundValidSelection = true;
if (match >= bestMatch) {
bestMatch = match;
bestChoice = i;
} }
} }
//cerr << "Preference " << i << "Match " << match << " bestMatch " << bestMatch << " choice " << bestChoice << " valid selection " << validSelection << endl; } // of active runways iteration
if (validSelection) {
//cerr << "Valid selection : " << i << endl;;
foundValidSelection = true;
if (match >= bestMatch) {
bestMatch = match;
bestChoice = i;
}
} }
if (foundValidSelection) { //cerr << "Preference " << i << "Match " << match << " bestMatch " << bestMatch << " choice " << bestChoice << " valid selection " << validSelection << endl;
//cerr << "Valid runay selection : " << bestChoice << endl; }
nrActive = activeRwys;
active = bestChoice; if (foundValidSelection) {
//cerr << "Valid runay selection : " << bestChoice << endl;
nrActive = activeRwys;
active = bestChoice;
return;
}
// If this didn't work, due to heavy winds, try again
// but select only one landing and one takeoff runway.
choice[0] = 0;
choice[1] = 0;
for (int i = activeRwys - 1; i; i--) {
if (rwyList[i].getType() == std::string("landing"))
choice[0] = i;
if (rwyList[i].getType() == std::string("takeoff"))
choice[1] = i;
}
//cerr << "Choosing " << choice[0] << " for landing and " << choice[1] << "for takeoff" << endl;
nrOfPreferences = rwyList[0].getPreferredRunways().size();
for (int i = 0; i < nrOfPreferences; i++) {
bool validSelection = true;
for (int j = 0; j < 2; j++) {
const auto& currentRunwayPrefs = rwyList.at(choice[j]).getPreferredRunways();
if (i >= currentRunwayPrefs.size()) {
validSelection = false;
continue;
}
const auto& name = currentRunwayPrefs.at(i);
if (!airport->hasRunwayWithIdent(name)) {
validSelection = false;
continue;
}
rwy = airport->getRunwayByIdent(name);
//cerr << "Succes" << endl;
hdgDiff = fabs(windHeading - rwy->headingDeg());
if (hdgDiff > 180)
hdgDiff = 360 - hdgDiff;
hdgDiff *= ((2 * M_PI) / 360.0); // convert to radians
crossWind = windSpeed * sin(hdgDiff);
tailWind = -windSpeed * cos(hdgDiff);
if ((tailWind > maxTail) || (crossWind > maxCross)) {
validSelection = false;
}
}
if (validSelection) {
//cerr << "Valid runay selection : " << i << endl;
active = i;
nrActive = 2;
return; return;
} }
// If this didn't work, due to heavy winds, try again
// but select only one landing and one takeoff runway.
choice[0] = 0;
choice[1] = 0;
for (int i = activeRwys - 1; i; i--) {
if (rwyList[i].getType() == std::string("landing"))
choice[0] = i;
if (rwyList[i].getType() == std::string("takeoff"))
choice[1] = i;
}
//cerr << "Choosing " << choice[0] << " for landing and " << choice[1] << "for takeoff" << endl;
nrOfPreferences = rwyList[0].getRwyList()->size();
for (int i = 0; i < nrOfPreferences; i++) {
bool validSelection = true;
for (int j = 0; j < 2; j++) {
name = rwyList[choice[j]].getRwyList(i);
rwy = airport->getRunwayByIdent(name);
//cerr << "Succes" << endl;
hdgDiff = fabs(windHeading - rwy->headingDeg());
if (hdgDiff > 180)
hdgDiff = 360 - hdgDiff;
hdgDiff *= ((2 * M_PI) / 360.0); // convert to radians
crossWind = windSpeed * sin(hdgDiff);
tailWind = -windSpeed * cos(hdgDiff);
if ((tailWind > maxTail) || (crossWind > maxCross))
validSelection = false;
}
if (validSelection) {
//cerr << "Valid runay selection : " << i << endl;
active = i;
nrActive = 2;
return;
}
}
} }
active = -1;
nrActive = 0;
} }
void RunwayGroup::getActive(int i, std::string & name, std::string & type) void RunwayGroup::getActive(int i, std::string & name, std::string & type)
@ -332,11 +354,22 @@ void RunwayGroup::getActive(int i, std::string & name, std::string & type)
if (i == -1) { if (i == -1) {
return; return;
} }
if (nrActive == (int) rwyList.size()) {
name = rwyList[i].getRwyList(active); if (i >= nrActive) {
SG_LOG(SG_AI, SG_DEV_ALERT, "RunwayGroup::getActive: invalid index " << i);
return;
}
// nrActive is either the full size of the list *or* two, if we
// fell back due to heavy winds
const bool usingFullList = nrActive == (int)rwyList.size();
if (usingFullList) {
const auto& runways = rwyList.at(i).getPreferredRunways();
name = runways.at(active);
type = rwyList[i].getType(); type = rwyList[i].getType();
} else { } else {
name = rwyList[choice[i]].getRwyList(active); const auto& runways = rwyList.at(choice[i]).getPreferredRunways();
name = runways.at(active);
type = rwyList[choice[i]].getType(); type = rwyList[choice[i]].getType();
} }
} }
@ -396,15 +429,15 @@ ScheduleTime *FGRunwayPreference::getSchedule(const char *trafficType)
RunwayGroup *FGRunwayPreference::getGroup(const std::string & groupName) RunwayGroup *FGRunwayPreference::getGroup(const std::string & groupName)
{ {
PreferenceListIterator i = preferences.begin(); auto it = std::find_if(preferences.begin(), preferences.end(),
if (preferences.begin() == preferences.end()) [&groupName](const RunwayGroup& g) {
return 0; return g.getName() == groupName;
while (!(i == preferences.end() || i->getName() == groupName)) });
i++;
if (i != preferences.end()) if (it == preferences.end())
return &(*i); return nullptr;
else
return 0; return &(*it); // not thrilled about this, but ok
} }
std::string FGRunwayPreference::getId() std::string FGRunwayPreference::getId()

5
src/Airports/runwayprefs.hxx
View file

@ -79,8 +79,7 @@ public:
void clear(); void clear();
std::string getType() { return type; }; std::string getType() { return type; };
stringVec *getRwyList() { return &preferredRunways; }; const stringVec& getPreferredRunways() const { return preferredRunways; };
std::string getRwyList(int j) { return preferredRunways[j]; };
}; };
/*****************************************************************************/ /*****************************************************************************/
@ -107,7 +106,7 @@ public:
int getNrActiveRunways() { return nrActive;}; int getNrActiveRunways() { return nrActive;};
void getActive(int i, std::string& name, std::string& type); void getActive(int i, std::string& name, std::string& type);
std::string getName() { return name; }; const std::string& getName() const { return name; };
void clear() { rwyList.clear(); }; void clear() { rwyList.clear(); };
//void add(string, string); //void add(string, string);
}; };