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

fix two bugs in AI action handling which lead to crashes...

Browse source 
...if garbage arguments are passed to them
This commit is contained in:
Iurii Chernyi 2010-02-21 12:23:41 +00:00
parent 747ba43cdd
commit af45dcb891
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/ai/actions.cpp
View file

@ -261,7 +261,7 @@ void attack_result::do_check_before()
}
if (attacker_weapon_!=-1) {
if ((attacker_weapon_<0)||(attacker_weapon_ > static_cast<int>(attacker->attacks().size()))) {
if ((attacker_weapon_<0)||(attacker_weapon_ >= static_cast<int>(attacker->attacks().size()))) {
LOG_AI_ACTIONS << "invalid weapon selection for the attacker\n";
set_error(E_WRONG_ATTACKER_WEAPON);
return;
@ -408,6 +408,11 @@ bool move_result::test_route(const unit &un, const team &my_team, const unit_map
set_error(E_EMPTY_MOVE);
return false;
}
if (!to_.valid()) {
set_error(E_NO_ROUTE);
return false;
}
const pathfind::shortest_path_calculator calc(un, my_team, units, teams,map);
#ifndef EXPERIMENTAL