BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

HPChange Reason: Fix push after free, and type being overwritten (#8359)

Browse Source 
* HPChange Reason: Fix push after free, and type being overwritten

Fixes #8227 and #8344
This commit is contained in:
rubenwardy 2019-03-12 07:56:56 +00:00 committed by Loïc Blot
parent 3b25b807f3
commit 1e3e4fb649
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/content_sao.h
View File

@ -405,6 +405,11 @@ struct PlayerHPChangeReason {
bool from_mod = false; bool from_mod = false;
int lua_reference = -1; int lua_reference = -1;
inline bool hasLuaReference() const
{
return lua_reference >= 0;
}
bool setTypeFromString(const std::string &typestr) bool setTypeFromString(const std::string &typestr)
{ {
if (typestr == "set_hp") if (typestr == "set_hp")

14
src/script/cpp_api/s_base.cpp
View File

@ -384,14 +384,18 @@ void ScriptApiBase::objectrefGetOrCreate(lua_State *L,
void ScriptApiBase::pushPlayerHPChangeReason(lua_State *L, const PlayerHPChangeReason &reason) void ScriptApiBase::pushPlayerHPChangeReason(lua_State *L, const PlayerHPChangeReason &reason)
{ {
if (reason.lua_reference >= 0) { if (reason.hasLuaReference())
lua_rawgeti(L, LUA_REGISTRYINDEX, reason.lua_reference); lua_rawgeti(L, LUA_REGISTRYINDEX, reason.lua_reference);
luaL_unref(L, LUA_REGISTRYINDEX, reason.lua_reference); else
} else
lua_newtable(L); lua_newtable(L);
lua_pushstring(L, reason.getTypeAsString().c_str()); lua_getfield(L, -1, "type");
lua_setfield(L, -2, "type"); bool has_type = (bool)lua_isstring(L, -1);
lua_pop(L, 1);
if (!has_type) {
lua_pushstring(L, reason.getTypeAsString().c_str());
lua_setfield(L, -2, "type");
}
lua_pushstring(L, reason.from_mod ? "mod" : "engine"); lua_pushstring(L, reason.from_mod ? "mod" : "engine");
lua_setfield(L, -2, "from"); lua_setfield(L, -2, "from");

3
src/script/lua_api/l_object.cpp
View File

@ -257,6 +257,9 @@ int ObjectRef::l_set_hp(lua_State *L)
if (co->getType() == ACTIVEOBJECT_TYPE_PLAYER) if (co->getType() == ACTIVEOBJECT_TYPE_PLAYER)
getServer(L)->SendPlayerHPOrDie((PlayerSAO *)co, reason); getServer(L)->SendPlayerHPOrDie((PlayerSAO *)co, reason);
if (reason.hasLuaReference())
luaL_unref(L, LUA_REGISTRYINDEX, reason.lua_reference);
// Return // Return
return 0; return 0;
} }