fly/flightgear
1
0
Fork 0
Code Activity

Crash:harden against malformed menu bar entries

Browse source 
If a menu-bar item is missing a <name>, we can end up building a string
from nullptr, which is a SEGV.

Reported as Sentry issue FLIGHTGEAR-1D

Will back-port to LTS once verified.
This commit is contained in:
James Turner 2020-09-08 14:01:39 +01:00
parent 830a890eff
commit e26a2ecab0
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/GUI/menubar.cxx
View file

@ -20,14 +20,24 @@ FGMenuBar::~FGMenuBar ()
std::string
FGMenuBar::getLocalizedLabel(SGPropertyNode* node)
{
const char* name = node->getStringValue("name", 0);
if (!node)
return {};
std::string translated = globals->get_locale()->getLocalizedString(name, "menu");
const char* name = node->getStringValue("name", 0);
const auto translated = globals->get_locale()->getLocalizedString(name, "menu");
if (!translated.empty())
return translated;
// return default with fallback to name
return node->getStringValue("label", name);
const char* l = node->getStringValue("label", name);
// this can occur if the menu item is missing a <name>
if (l == nullptr) {
SG_LOG(SG_GUI, SG_ALERT, "FGMenuBar::getLocalizedLabel: No <name> defined for:" << node->getPath());
return string{"<unnamed>"};
}
return string{l};
}
// end of menubar.cxx