pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-25 04:22:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Bug Fix] Fix stack leaks in Lua events #2254

Browse Source 
EventItem was leaving the package table on the stack in successful
(non-encounter) calls and only popping the return. All events were
also leaking the full stack on lua_pcall errors. Lua mod callbacks
were popping error returns but leaking the table.
This commit is contained in:
hg 2022-06-09 18:20:35 -04:00 committed by GitHub
parent bec28769aa
commit 8ef3e87370
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
zone/lua_mod.cpp
View File

@ -206,7 +206,7 @@ void LuaMod::MeleeMitigation(Mob *self, Mob *attacker, DamageHitInfo &hit, Extra
if (lua_pcall(L, 1, 1, 0)) { if (lua_pcall(L, 1, 1, 0)) {
std::string error = lua_tostring(L, -1); std::string error = lua_tostring(L, -1);
parser_->AddError(error); parser_->AddError(error);
lua_pop(L, 1); lua_pop(L, 2);
return; return;
} }
@ -253,7 +253,7 @@ void LuaMod::ApplyDamageTable(Mob *self, DamageHitInfo &hit, bool &ignoreDefault
if (lua_pcall(L, 1, 1, 0)) { if (lua_pcall(L, 1, 1, 0)) {
std::string error = lua_tostring(L, -1); std::string error = lua_tostring(L, -1);
parser_->AddError(error); parser_->AddError(error);
lua_pop(L, 1); lua_pop(L, 2);
return; return;
} }
@ -301,7 +301,7 @@ void LuaMod::AvoidDamage(Mob *self, Mob *other, DamageHitInfo &hit, bool &return
if (lua_pcall(L, 1, 1, 0)) { if (lua_pcall(L, 1, 1, 0)) {
std::string error = lua_tostring(L, -1); std::string error = lua_tostring(L, -1);
parser_->AddError(error); parser_->AddError(error);
lua_pop(L, 1); lua_pop(L, 2);
return; return;
} }
@ -354,7 +354,7 @@ void LuaMod::CheckHitChance(Mob *self, Mob* other, DamageHitInfo &hit, bool &ret
if (lua_pcall(L, 1, 1, 0)) { if (lua_pcall(L, 1, 1, 0)) {
std::string error = lua_tostring(L, -1); std::string error = lua_tostring(L, -1);
parser_->AddError(error); parser_->AddError(error);
lua_pop(L, 1); lua_pop(L, 2);
return; return;
} }
@ -409,7 +409,7 @@ void LuaMod::CommonOutgoingHitSuccess(Mob *self, Mob *other, DamageHitInfo &hit,
if (lua_pcall(L, 1, 1, 0)) { if (lua_pcall(L, 1, 1, 0)) {
std::string error = lua_tostring(L, -1); std::string error = lua_tostring(L, -1);
parser_->AddError(error); parser_->AddError(error);
lua_pop(L, 1); lua_pop(L, 2);
return; return;
} }
@ -459,7 +459,7 @@ void LuaMod::TryCriticalHit(Mob *self, Mob *defender, DamageHitInfo &hit, ExtraA
if (lua_pcall(L, 1, 1, 0)) { if (lua_pcall(L, 1, 1, 0)) {
std::string error = lua_tostring(L, -1); std::string error = lua_tostring(L, -1);
parser_->AddError(error); parser_->AddError(error);
lua_pop(L, 1); lua_pop(L, 2);
return; return;
} }
@ -505,7 +505,7 @@ void LuaMod::GetRequiredAAExperience(Client *self, uint32 &returnValue, bool &ig
if (lua_pcall(L, 1, 1, 0)) { if (lua_pcall(L, 1, 1, 0)) {
std::string error = lua_tostring(L, -1); std::string error = lua_tostring(L, -1);
parser_->AddError(error); parser_->AddError(error);
lua_pop(L, 1); lua_pop(L, 2);
return; return;
} }
@ -553,7 +553,7 @@ void LuaMod::GetEXPForLevel(Client *self, uint16 level, uint32 &returnValue, boo
if (lua_pcall(L, 1, 1, 0)) { if (lua_pcall(L, 1, 1, 0)) {
std::string error = lua_tostring(L, -1); std::string error = lua_tostring(L, -1);
parser_->AddError(error); parser_->AddError(error);
lua_pop(L, 1); lua_pop(L, 2);
return; return;
} }
@ -604,7 +604,7 @@ void LuaMod::GetExperienceForKill(Client *self, Mob *against, uint32 &returnValu
if (lua_pcall(L, 1, 1, 0)) { if (lua_pcall(L, 1, 1, 0)) {
std::string error = lua_tostring(L, -1); std::string error = lua_tostring(L, -1);
parser_->AddError(error); parser_->AddError(error);
lua_pop(L, 1); lua_pop(L, 2);
return; return;
} }

6
zone/lua_parser.cpp
View File

@ -340,6 +340,7 @@ int LuaParser::_EventNPC(std::string package_name, QuestEventID evt, NPC* npc, M
std::string error = lua_tostring(L, -1); std::string error = lua_tostring(L, -1);
AddError(error); AddError(error);
quest_manager.EndQuest(); quest_manager.EndQuest();
lua_pop(L, npop);
return 0; return 0;
} }
quest_manager.EndQuest(); quest_manager.EndQuest();
@ -433,6 +434,7 @@ int LuaParser::_EventPlayer(std::string package_name, QuestEventID evt, Client *
std::string error = lua_tostring(L, -1); std::string error = lua_tostring(L, -1);
AddError(error); AddError(error);
quest_manager.EndQuest(); quest_manager.EndQuest();
lua_pop(L, npop);
return 0; return 0;
} }
quest_manager.EndQuest(); quest_manager.EndQuest();
@ -493,6 +495,7 @@ int LuaParser::_EventItem(std::string package_name, QuestEventID evt, Client *cl
} else { } else {
lua_getfield(L, LUA_REGISTRYINDEX, package_name.c_str()); lua_getfield(L, LUA_REGISTRYINDEX, package_name.c_str());
lua_getfield(L, -1, sub_name); lua_getfield(L, -1, sub_name);
npop = 2;
} }
lua_createtable(L, 0, 0); lua_createtable(L, 0, 0);
@ -516,6 +519,7 @@ int LuaParser::_EventItem(std::string package_name, QuestEventID evt, Client *cl
std::string error = lua_tostring(L, -1); std::string error = lua_tostring(L, -1);
AddError(error); AddError(error);
quest_manager.EndQuest(); quest_manager.EndQuest();
lua_pop(L, npop);
return 0; return 0;
} }
quest_manager.EndQuest(); quest_manager.EndQuest();
@ -597,6 +601,7 @@ int LuaParser::_EventSpell(std::string package_name, QuestEventID evt, NPC* npc,
std::string error = lua_tostring(L, -1); std::string error = lua_tostring(L, -1);
AddError(error); AddError(error);
quest_manager.EndQuest(); quest_manager.EndQuest();
lua_pop(L, npop);
return 0; return 0;
} }
quest_manager.EndQuest(); quest_manager.EndQuest();
@ -663,6 +668,7 @@ int LuaParser::_EventEncounter(std::string package_name, QuestEventID evt, std::
std::string error = lua_tostring(L, -1); std::string error = lua_tostring(L, -1);
AddError(error); AddError(error);
quest_manager.EndQuest(); quest_manager.EndQuest();
lua_pop(L, 2);
return 0; return 0;
} }
quest_manager.EndQuest(); quest_manager.EndQuest();