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

Fix returning invalid unit types (bug #25041)

Browse source
This commit is contained in:
Celtic Minstrel 2016-09-06 11:41:22 -04:00
parent b7455d3bd4
commit 91bd6ab6d0
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/scripting/lua_unit_type.cpp
View file

@ -110,8 +110,11 @@ static int impl_unit_type_lookup(lua_State* L)
} else {
ut = unit_types.find(id);
}
luaW_pushunittype(L, ut);
return 1;
if(ut) {
luaW_pushunittype(L, *ut);
return 1;
}
return 0;
}
static int impl_unit_type_new(lua_State* L)
@ -143,7 +146,7 @@ static int impl_unit_type_next(lua_State* L)
return 0;
}
lua_pushlstring(L, it->first.c_str(), it->first.size());
luaW_pushunittype(L, &it->second);
luaW_pushunittype(L, it->second);
return 2;
}
@ -190,9 +193,9 @@ namespace lua_unit_type {
}
}
void luaW_pushunittype(lua_State *L, const unit_type* ut)
void luaW_pushunittype(lua_State *L, const unit_type& ut)
{
*static_cast<const unit_type**>(lua_newuserdata(L, sizeof(unit_type*))) = ut;
*static_cast<const unit_type**>(lua_newuserdata(L, sizeof(unit_type*))) = &ut;
luaL_setmetatable(L, UnitType);
}

2
src/scripting/lua_unit_type.hpp
View file

@ -31,7 +31,7 @@ namespace lua_unit_type {
/// Create a lua object containing a reference to a unittype, and a
/// metatable to access the properties.
void luaW_pushunittype(lua_State *, const unit_type*);
void luaW_pushunittype(lua_State *, const unit_type&);
/// Test if a stack element is a unit type, and return it if so
const unit_type* luaW_tounittype(lua_State*, int);