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

check before dereferencing

Browse source
This commit is contained in:
gfgtdf 2018-12-02 19:44:14 +01:00
parent f09352570c
commit 830b2fdc3d
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/actions/advancement.cpp
View file

@ -56,7 +56,12 @@ namespace
{
int advance_unit_dialog(const map_location &loc)
{
const unit& u = *resources::gameboard->units().find(loc);
const auto u_it = resources::gameboard->units().find(loc);
if(!u_it) {
ERR_NG << "advance_unit_dialog: unit not found\n";
return 0;
}
const unit& u = *u_it;
std::vector<unit_const_ptr> previews;
for (const std::string& advance : u.advances_to()) {
@ -186,6 +191,10 @@ namespace
if(ai_advancement_ != nullptr)
{
unit_map::iterator u = resources::gameboard->units().find(loc_);
if(!u) {
ERR_NG << "unit_advancement_choice: unit not found\n";
return config{};
}
const std::vector<std::string>& options = u->advances_to();
const std::vector<std::string>& allowed = ai_advancement_->get_advancements(u);