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

Fix segfault in typed_formula<color_t>::execute

Browse source 
The list had already been destroyed by the time it was indexed.
This commit is contained in:
Celtic Minstrel 2016-12-11 02:55:43 -05:00
parent b5d25135fc
commit 2bbe419a44
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gui/auxiliary/typed_formula.hpp
View file

@ -231,7 +231,8 @@ inline color_t typed_formula<color_t>::execute(
const game_logic::map_formula_callable& variables,
game_logic::function_symbol_table* functions) const
{
const auto& result = game_logic::formula(formula_, functions).evaluate(variables).as_list();
const variant v = game_logic::formula(formula_, functions).evaluate(variables);
const auto& result = v.as_list();
int alpha = result.size() == 4 ? result[3].as_int() : ALPHA_OPAQUE;
return color_t(result.at(0).as_int(), result.at(1).as_int(), result.at(2).as_int(), alpha);
}