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

Avoid a null pointer access.

Browse source
This commit is contained in:
fendrin 2013-05-03 20:42:53 +02:00
parent 1a44707dfe
commit 8ab9659f36
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/variable.cpp
View file

@ -471,7 +471,8 @@ scoped_wml_variable::scoped_wml_variable(const std::string& var_name) :
var_name_(var_name),
activated_(false)
{
resources::gamedata->scoped_variables.push_back(this);
if (resources::gamedata)
resources::gamedata->scoped_variables.push_back(this);
}
config &scoped_wml_variable::store(const config &var_value)
@ -495,8 +496,10 @@ scoped_wml_variable::~scoped_wml_variable()
}
LOG_NG << "scoped_wml_variable: var_name \"" << var_name_ << "\" has been reverted.\n";
}
assert(resources::gamedata->scoped_variables.back() == this);
resources::gamedata->scoped_variables.pop_back();
if (resources::gamedata) {
assert(resources::gamedata->scoped_variables.back() == this);
resources::gamedata->scoped_variables.pop_back();
}
}
void scoped_xy_unit::activate()