fly/flightgear
1
0
Fork 0
Code Activity

Fix a bug for allowed paths

Browse source 
Under some conditions on my system
aircraft_paths.begin() was equal to scenery_paths.end()
This resulted in neither of them being added to read_allowed_paths
followed by failure to load Nasal scripts from the aircraft directory.

This might happen, if scenery_paths gets allocated just before aircraft_paths
in memory.
Better loop across the desired lists instead of using fancy tricks with
the iterator.
This commit is contained in:
Torsten Dreyer 2016-01-12 11:19:26 +01:00
parent 0250d2ee5b
commit 296849cf3d
1 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/Main/util.cxx
View file

@ -106,24 +106,25 @@ void fgInitAllowedPaths()
// not plain fg_scenery, to avoid making
// /sim/terrasync/scenery-dir a security hole
for( string_list::const_iterator it = aircraft_paths.begin();;++it )
const string_list * path_lists_to_add[] = {
&aircraft_paths,
&scenery_paths
};
for( size_t i = 0; i < sizeof(path_lists_to_add)/sizeof(path_lists_to_add[0]); i++ )
{
if (it == aircraft_paths.end()) {
it = scenery_paths.begin();
for( string_list::const_iterator it = path_lists_to_add[i]->begin(); it != path_lists_to_add[i]->end();++it )
{
// if we get the initialization order wrong, better to have an
// obvious error than a can-read-everything security hole...
if (it->empty() || fg_root.empty() || fg_home.empty()){
flightgear::fatalMessageBox("Nasal initialization error",
"Empty string in FG_ROOT, FG_HOME, FG_AIRCRAFT or FG_SCENERY",
"or fgInitAllowedPaths() called too early");
exit(-1);
}
read_allowed_paths.push_back(SGPath(*it).realpath() + sep + "*");
}
if (it == scenery_paths.end()) {
break; // here rather than in the loop condition because
// scenery_paths may be empty
}
// if we get the initialization order wrong, better to have an
// obvious error than a can-read-everything security hole...
if (it->empty() || fg_root.empty() || fg_home.empty()){
flightgear::fatalMessageBox("Nasal initialization error",
"Empty string in FG_ROOT, FG_HOME, FG_AIRCRAFT or FG_SCENERY",
"or fgInitAllowedPaths() called too early");
exit(-1);
}
read_allowed_paths.push_back(SGPath(*it).realpath() + sep + "*");
}
write_allowed_paths.push_back(fg_home + sep + "*.sav");