fly/flightgear
1
0
Fork 0
Code Activity

src/Viewer/viewmgr.cxx: removed asserts on inputs from aircraft/nasal code.

Browse source 
The fgfs executable is the unit within which it makes sense to check
preconditions with assert. We are not in control of aircraft code in the same
way.

This allows debug build of test-suite to check handling of out-of-range view
numbers.
This commit is contained in:
Julian Smith 2021-02-19 21:05:50 +00:00
parent ca423e0e3e
commit 309e28c6d7
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/Viewer/viewmgr.cxx
View file

@ -80,9 +80,8 @@ FGViewMgr::init ()
SG_LOG(SG_VIEW, SG_ALERT, SG_LOG(SG_VIEW, SG_ALERT,
"Invalid /sim/current-view/view-number=" << _current "Invalid /sim/current-view/view-number=" << _current
<< ". views.size()=" << views.size() << ". views.size()=" << views.size()
<< ". Will assert false and use zero." << ". Will use zero."
); );
assert(0);
_current = 0; _current = 0;
} }
@ -197,7 +196,13 @@ FGViewMgr::get_current_view()
{ {
if (views.empty()) if (views.empty())
return nullptr; return nullptr;
assert(_current >= 0 && _current < (int) views.size()); if (_current < 0 || _current >= (int) views.size()) {
SG_LOG(SG_VIEW, SG_ALERT, "Invalid _current=" << _current
<< ". views.size()=" << views.size()
<< ". Will use zero."
);
_current = 0;
}
return views[_current]; return views[_current];
} }
@ -305,20 +310,14 @@ void FGViewMgr::setCurrentViewIndex(int newview)
newview = i; newview = i;
} }
if (newview < 0) { if (newview < 0) {
SG_LOG(SG_VIEW, SG_ALERT, SG_LOG(SG_VIEW, SG_ALERT, "Failed to find -ve newview=" << newview);
"Failed to find -ve newview=" << newview
<< ". Will assert false and ignore."
);
assert(0);
return; return;
} }
} }
if (newview < 0 || newview >= (int) views.size()) { if (newview < 0 || newview >= (int) views.size()) {
SG_LOG(SG_VIEW, SG_ALERT, "Invalid newview=" << newview SG_LOG(SG_VIEW, SG_ALERT, "Ignoring invalid newview=" << newview
<< ". views.size()=" << views.size() << ". views.size()=" << views.size()
<< ". Will assert false and ignore."
); );
assert(0);
return; return;
} }