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

Fix some invalid Lua stack accesses in [animate_unit]

Browse source
This commit is contained in:
Celtic Minstrel 2017-02-28 16:26:22 -05:00
parent b37d7233d5
commit ee79eb426e
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/scripting/game_lua_kernel.cpp
View file

@ -374,10 +374,10 @@ static int impl_add_animation(lua_State* L)
if(lua_isnumber(L, -1)) {
v1 = lua_tonumber(L, -1);
} else if(lua_istable(L, -1)) {
lua_rawgeti(L, 1, 1);
lua_rawgeti(L, -1, 1);
v1 = lua_tonumber(L, -1);
lua_pop(L, 1);
lua_rawgeti(L, 1, 2);
lua_rawgeti(L, -1, 2);
v2 = lua_tonumber(L, -1);
lua_pop(L, 2);
} else if(!lua_isnoneornil(L, -1)) {
@ -403,9 +403,10 @@ static int impl_add_animation(lua_State* L)
lua_getfield(L, 5, "color");
if(lua_istable(L, -1) && lua_rawlen(L, -1) == 3) {
lua_rawgeti(L, 1, 1); // red @ -3
lua_rawgeti(L, 1, 2); // green @ -2
lua_rawgeti(L, 1, 3); // blue @ -1
int idx = lua_absindex(L, -1);
lua_rawgeti(L, idx, 1); // red @ -3
lua_rawgeti(L, idx, 2); // green @ -2
lua_rawgeti(L, idx, 3); // blue @ -1
color = color_t(lua_tonumber(L, -3), lua_tonumber(L, -2), lua_tonumber(L, -1));
lua_pop(L, 3);
} else if(!lua_isnoneornil(L, -1)) {