0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix UB in attack_predictions::set_data()

Browse source 
Dereferencing an end iterator is undefined behavior.
With Microsoft debug CRT it causes a crash.
This commit is contained in:
Jyrki Vesterinen 2017-01-24 19:13:30 +02:00
parent efb560a23a
commit daf08b6825
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/gui/dialogs/attack_predictions.cpp
View file

@ -87,12 +87,11 @@ void attack_predictions::set_data(window& window, const combatant_data& attacker
unit_abilities::effect dmg_effect(dmg_specials, weapon->damage(), attacker.stats_.backstab_pos);
// Get the SET damage modifier, if any.
const unit_abilities::individual_effect* set_dmg_effect = &*(
std::find_if(dmg_effect.begin(), dmg_effect.end(), [](const unit_abilities::individual_effect& e) { return e.type == unit_abilities::SET; })
);
auto set_dmg_effect =
std::find_if(dmg_effect.begin(), dmg_effect.end(), [](const unit_abilities::individual_effect& e) { return e.type == unit_abilities::SET; });
// Either user the SET modifier or the base weapon damage.
if(!set_dmg_effect) {
if(set_dmg_effect == dmg_effect.end()) {
// TODO: formatting
ss << weapon->name() << ": " << weapon->damage();
} else {