Skip to content

Revert "fix: prevent crashes by validating userdata in Lua bindings" #3443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dudantas wants to merge 1 commit into from
Closed

Revert "fix: prevent crashes by validating userdata in Lua bindings" #3443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/lua/functions/core/game/game_functions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -793,7 +793,7 @@ int GameFunctions::luaGameGetNormalizedGuildName(lua_State* L) {

int GameFunctions::luaGameAddInfluencedMonster(lua_State* L) {
// Game.addInfluencedMonster(monster)
const auto &monster = Lua::getUserdataShared<Monster>(L, 1, "Monster");
const auto &monster = Lua::getUserdataShared<Monster>(L, 1);
if (!monster) {
Lua::reportErrorFunc(Lua::getErrorDesc(LUA_ERROR_MONSTER_NOT_FOUND));
Lua::pushBoolean(L, false);
Expand Down
4 changes: 2 additions & 2 deletions src/lua/functions/core/game/global_functions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ int GlobalFunctions::luaDoAreaCombatCondition(lua_State* L) {
return 1;
}

const auto &condition = Lua::getUserdataShared<Condition>(L, 4, "Condition");
const auto &condition = Lua::getUserdataShared<Condition>(L, 4);
if (!condition) {
Lua::reportErrorFunc(Lua::getErrorDesc(LUA_ERROR_CONDITION_NOT_FOUND));
Lua::pushBoolean(L, false);
Expand Down Expand Up @@ -515,7 +515,7 @@ int GlobalFunctions::luaDoTargetCombatCondition(lua_State* L) {
return 1;
}

const auto &condition = Lua::getUserdataShared<Condition>(L, 3, "Condition");
const auto &condition = Lua::getUserdataShared<Condition>(L, 3);
if (!condition) {
Lua::reportErrorFunc(Lua::getErrorDesc(LUA_ERROR_CONDITION_NOT_FOUND));
Lua::pushBoolean(L, false);
Expand Down
32 changes: 16 additions & 16 deletions src/lua/functions/core/game/modal_window_functions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ int ModalWindowFunctions::luaModalWindowCreate(lua_State* L) {

int ModalWindowFunctions::luaModalWindowGetId(lua_State* L) {
// modalWindow:getId()
const auto &window = Lua::getUserdataShared<ModalWindow>(L, 1, "ModalWindow");
const auto &window = Lua::getUserdataShared<ModalWindow>(L, 1);
if (window) {
lua_pushnumber(L, window->id);
} else {
Expand All @@ -67,7 +67,7 @@ int ModalWindowFunctions::luaModalWindowGetId(lua_State* L) {

int ModalWindowFunctions::luaModalWindowGetTitle(lua_State* L) {
// modalWindow:getTitle()
const auto &window = Lua::getUserdataShared<ModalWindow>(L, 1, "ModalWindow");
const auto &window = Lua::getUserdataShared<ModalWindow>(L, 1);
if (window) {
Lua::pushString(L, window->title);
} else {
Expand All @@ -78,7 +78,7 @@ int ModalWindowFunctions::luaModalWindowGetTitle(lua_State* L) {

int ModalWindowFunctions::luaModalWindowGetMessage(lua_State* L) {
// modalWindow:getMessage()
const auto &window = Lua::getUserdataShared<ModalWindow>(L, 1, "ModalWindow");
const auto &window = Lua::getUserdataShared<ModalWindow>(L, 1);
if (window) {
Lua::pushString(L, window->message);
} else {
Expand All @@ -90,7 +90,7 @@ int ModalWindowFunctions::luaModalWindowGetMessage(lua_State* L) {
int ModalWindowFunctions::luaModalWindowSetTitle(lua_State* L) {
// modalWindow:setTitle(text)
const std::string &text = Lua::getString(L, 2);
const auto &window = Lua::getUserdataShared<ModalWindow>(L, 1, "ModalWindow");
const auto &window = Lua::getUserdataShared<ModalWindow>(L, 1);
if (window) {
window->title = text;
Lua::pushBoolean(L, true);
Expand All @@ -103,7 +103,7 @@ int ModalWindowFunctions::luaModalWindowSetTitle(lua_State* L) {
int ModalWindowFunctions::luaModalWindowSetMessage(lua_State* L) {
// modalWindow:setMessage(text)
const std::string &text = Lua::getString(L, 2);
const auto &window = Lua::getUserdataShared<ModalWindow>(L, 1, "ModalWindow");
const auto &window = Lua::getUserdataShared<ModalWindow>(L, 1);
if (window) {
window->message = text;
Lua::pushBoolean(L, true);
Expand All @@ -115,7 +115,7 @@ int ModalWindowFunctions::luaModalWindowSetMessage(lua_State* L) {

int ModalWindowFunctions::luaModalWindowGetButtonCount(lua_State* L) {
// modalWindow:getButtonCount()
const auto &window = Lua::getUserdataShared<ModalWindow>(L, 1, "ModalWindow");
const auto &window = Lua::getUserdataShared<ModalWindow>(L, 1);
if (window) {
lua_pushnumber(L, window->buttons.size());
} else {
Expand All @@ -126,7 +126,7 @@ int ModalWindowFunctions::luaModalWindowGetButtonCount(lua_State* L) {

int ModalWindowFunctions::luaModalWindowGetChoiceCount(lua_State* L) {
// modalWindow:getChoiceCount()
const auto &window = Lua::getUserdataShared<ModalWindow>(L, 1, "ModalWindow");
const auto &window = Lua::getUserdataShared<ModalWindow>(L, 1);
if (window) {
lua_pushnumber(L, window->choices.size());
} else {
Expand All @@ -139,7 +139,7 @@ int ModalWindowFunctions::luaModalWindowAddButton(lua_State* L) {
// modalWindow:addButton(id, text)
const std::string &text = Lua::getString(L, 3);
uint8_t id = Lua::getNumber<uint8_t>(L, 2);
const auto &window = Lua::getUserdataShared<ModalWindow>(L, 1, "ModalWindow");
const auto &window = Lua::getUserdataShared<ModalWindow>(L, 1);
if (window) {
window->buttons.emplace_back(text, id);
Lua::pushBoolean(L, true);
Expand All @@ -153,7 +153,7 @@ int ModalWindowFunctions::luaModalWindowAddChoice(lua_State* L) {
// modalWindow:addChoice(id, text)
const std::string &text = Lua::getString(L, 3);
uint8_t id = Lua::getNumber<uint8_t>(L, 2);
const auto &window = Lua::getUserdataShared<ModalWindow>(L, 1, "ModalWindow");
const auto &window = Lua::getUserdataShared<ModalWindow>(L, 1);
if (window) {
window->choices.emplace_back(text, id);
Lua::pushBoolean(L, true);
Expand All @@ -165,7 +165,7 @@ int ModalWindowFunctions::luaModalWindowAddChoice(lua_State* L) {

int ModalWindowFunctions::luaModalWindowGetDefaultEnterButton(lua_State* L) {
// modalWindow:getDefaultEnterButton()
const auto &window = Lua::getUserdataShared<ModalWindow>(L, 1, "ModalWindow");
const auto &window = Lua::getUserdataShared<ModalWindow>(L, 1);
if (window) {
lua_pushnumber(L, window->defaultEnterButton);
} else {
Expand All @@ -176,7 +176,7 @@ int ModalWindowFunctions::luaModalWindowGetDefaultEnterButton(lua_State* L) {

int ModalWindowFunctions::luaModalWindowSetDefaultEnterButton(lua_State* L) {
// modalWindow:setDefaultEnterButton(buttonId)
const auto &window = Lua::getUserdataShared<ModalWindow>(L, 1, "ModalWindow");
const auto &window = Lua::getUserdataShared<ModalWindow>(L, 1);
if (window) {
window->defaultEnterButton = Lua::getNumber<uint8_t>(L, 2);
Lua::pushBoolean(L, true);
Expand All @@ -188,7 +188,7 @@ int ModalWindowFunctions::luaModalWindowSetDefaultEnterButton(lua_State* L) {

int ModalWindowFunctions::luaModalWindowGetDefaultEscapeButton(lua_State* L) {
// modalWindow:getDefaultEscapeButton()
const auto &window = Lua::getUserdataShared<ModalWindow>(L, 1, "ModalWindow");
const auto &window = Lua::getUserdataShared<ModalWindow>(L, 1);
if (window) {
lua_pushnumber(L, window->defaultEscapeButton);
} else {
Expand All @@ -199,7 +199,7 @@ int ModalWindowFunctions::luaModalWindowGetDefaultEscapeButton(lua_State* L) {

int ModalWindowFunctions::luaModalWindowSetDefaultEscapeButton(lua_State* L) {
// modalWindow:setDefaultEscapeButton(buttonId)
const auto &window = Lua::getUserdataShared<ModalWindow>(L, 1, "ModalWindow");
const auto &window = Lua::getUserdataShared<ModalWindow>(L, 1);
if (window) {
window->defaultEscapeButton = Lua::getNumber<uint8_t>(L, 2);
Lua::pushBoolean(L, true);
Expand All @@ -211,7 +211,7 @@ int ModalWindowFunctions::luaModalWindowSetDefaultEscapeButton(lua_State* L) {

int ModalWindowFunctions::luaModalWindowHasPriority(lua_State* L) {
// modalWindow:hasPriority()
const auto &window = Lua::getUserdataShared<ModalWindow>(L, 1, "ModalWindow");
const auto &window = Lua::getUserdataShared<ModalWindow>(L, 1);
if (window) {
Lua::pushBoolean(L, window->priority);
} else {
Expand All @@ -222,7 +222,7 @@ int ModalWindowFunctions::luaModalWindowHasPriority(lua_State* L) {

int ModalWindowFunctions::luaModalWindowSetPriority(lua_State* L) {
// modalWindow:setPriority(priority)
const auto &window = Lua::getUserdataShared<ModalWindow>(L, 1, "ModalWindow");
const auto &window = Lua::getUserdataShared<ModalWindow>(L, 1);
if (window) {
window->priority = Lua::getBoolean(L, 2);
Lua::pushBoolean(L, true);
Expand All @@ -240,7 +240,7 @@ int ModalWindowFunctions::luaModalWindowSendToPlayer(lua_State* L) {
return 1;
}

const auto &window = Lua::getUserdataShared<ModalWindow>(L, 1, "ModalWindow");
const auto &window = Lua::getUserdataShared<ModalWindow>(L, 1);
if (window) {
if (!player->hasModalWindowOpen(window->id)) {
player->sendModalWindow(*window);
Expand Down
36 changes: 18 additions & 18 deletions src/lua/functions/core/game/zone_functions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ int ZoneFunctions::luaZoneCreate(lua_State* L) {
}

int ZoneFunctions::luaZoneCompare(lua_State* L) {
const auto &zone1 = Lua::getUserdataShared<Zone>(L, 1, "Zone");
const auto &zone2 = Lua::getUserdataShared<Zone>(L, 2, "Zone");
const auto &zone1 = Lua::getUserdataShared<Zone>(L, 1);
const auto &zone2 = Lua::getUserdataShared<Zone>(L, 2);
if (!zone1) {
Lua::reportErrorFunc(Lua::getErrorDesc(LUA_ERROR_ZONE_NOT_FOUND));
Lua::pushBoolean(L, false);
Expand All @@ -75,7 +75,7 @@ int ZoneFunctions::luaZoneCompare(lua_State* L) {

int ZoneFunctions::luaZoneGetName(lua_State* L) {
// Zone:getName()
const auto &zone = Lua::getUserdataShared<Zone>(L, 1, "Zone");
const auto &zone = Lua::getUserdataShared<Zone>(L, 1);
if (!zone) {
Lua::reportErrorFunc(Lua::getErrorDesc(LUA_ERROR_ZONE_NOT_FOUND));
Lua::pushBoolean(L, false);
Expand All @@ -87,7 +87,7 @@ int ZoneFunctions::luaZoneGetName(lua_State* L) {

int ZoneFunctions::luaZoneAddArea(lua_State* L) {
// Zone:addArea(fromPos, toPos)
const auto &zone = Lua::getUserdataShared<Zone>(L, 1, "Zone");
const auto &zone = Lua::getUserdataShared<Zone>(L, 1);
if (!zone) {
Lua::reportErrorFunc(Lua::getErrorDesc(LUA_ERROR_ZONE_NOT_FOUND));
Lua::pushBoolean(L, false);
Expand All @@ -103,7 +103,7 @@ int ZoneFunctions::luaZoneAddArea(lua_State* L) {

int ZoneFunctions::luaZoneSubtractArea(lua_State* L) {
// Zone:subtractArea(fromPos, toPos)
const auto &zone = Lua::getUserdataShared<Zone>(L, 1, "Zone");
const auto &zone = Lua::getUserdataShared<Zone>(L, 1);
if (!zone) {
Lua::reportErrorFunc(Lua::getErrorDesc(LUA_ERROR_ZONE_NOT_FOUND));
Lua::pushBoolean(L, false);
Expand All @@ -119,7 +119,7 @@ int ZoneFunctions::luaZoneSubtractArea(lua_State* L) {

int ZoneFunctions::luaZoneGetRemoveDestination(lua_State* L) {
// Zone:getRemoveDestination()
const auto &zone = Lua::getUserdataShared<Zone>(L, 1, "Zone");
const auto &zone = Lua::getUserdataShared<Zone>(L, 1);
if (!zone) {
Lua::reportErrorFunc(Lua::getErrorDesc(LUA_ERROR_ZONE_NOT_FOUND));
return 1;
Expand All @@ -130,7 +130,7 @@ int ZoneFunctions::luaZoneGetRemoveDestination(lua_State* L) {

int ZoneFunctions::luaZoneSetRemoveDestination(lua_State* L) {
// Zone:setRemoveDestination(pos)
const auto &zone = Lua::getUserdataShared<Zone>(L, 1, "Zone");
const auto &zone = Lua::getUserdataShared<Zone>(L, 1);
if (!zone) {
Lua::reportErrorFunc(Lua::getErrorDesc(LUA_ERROR_ZONE_NOT_FOUND));
return 1;
Expand All @@ -142,7 +142,7 @@ int ZoneFunctions::luaZoneSetRemoveDestination(lua_State* L) {

int ZoneFunctions::luaZoneGetPositions(lua_State* L) {
// Zone:getPositions()
const auto &zone = Lua::getUserdataShared<Zone>(L, 1, "Zone");
const auto &zone = Lua::getUserdataShared<Zone>(L, 1);
if (!zone) {
Lua::reportErrorFunc(Lua::getErrorDesc(LUA_ERROR_ZONE_NOT_FOUND));
Lua::pushBoolean(L, false);
Expand All @@ -162,7 +162,7 @@ int ZoneFunctions::luaZoneGetPositions(lua_State* L) {

int ZoneFunctions::luaZoneGetCreatures(lua_State* L) {
// Zone:getCreatures()
const auto &zone = Lua::getUserdataShared<Zone>(L, 1, "Zone");
const auto &zone = Lua::getUserdataShared<Zone>(L, 1);
if (!zone) {
Lua::reportErrorFunc(Lua::getErrorDesc(LUA_ERROR_ZONE_NOT_FOUND));
Lua::pushBoolean(L, false);
Expand All @@ -183,7 +183,7 @@ int ZoneFunctions::luaZoneGetCreatures(lua_State* L) {

int ZoneFunctions::luaZoneGetPlayers(lua_State* L) {
// Zone:getPlayers()
const auto &zone = Lua::getUserdataShared<Zone>(L, 1, "Zone");
const auto &zone = Lua::getUserdataShared<Zone>(L, 1);
if (!zone) {
Lua::reportErrorFunc(Lua::getErrorDesc(LUA_ERROR_ZONE_NOT_FOUND));
Lua::pushBoolean(L, false);
Expand All @@ -204,7 +204,7 @@ int ZoneFunctions::luaZoneGetPlayers(lua_State* L) {

int ZoneFunctions::luaZoneGetMonsters(lua_State* L) {
// Zone:getMonsters()
const auto &zone = Lua::getUserdataShared<Zone>(L, 1, "Zone");
const auto &zone = Lua::getUserdataShared<Zone>(L, 1);
if (!zone) {
Lua::reportErrorFunc(Lua::getErrorDesc(LUA_ERROR_ZONE_NOT_FOUND));
Lua::pushBoolean(L, false);
Expand All @@ -225,7 +225,7 @@ int ZoneFunctions::luaZoneGetMonsters(lua_State* L) {

int ZoneFunctions::luaZoneGetNpcs(lua_State* L) {
// Zone:getNpcs()
const auto &zone = Lua::getUserdataShared<Zone>(L, 1, "Zone");
const auto &zone = Lua::getUserdataShared<Zone>(L, 1);
if (!zone) {
Lua::reportErrorFunc(Lua::getErrorDesc(LUA_ERROR_ZONE_NOT_FOUND));
Lua::pushBoolean(L, false);
Expand All @@ -246,7 +246,7 @@ int ZoneFunctions::luaZoneGetNpcs(lua_State* L) {

int ZoneFunctions::luaZoneGetItems(lua_State* L) {
// Zone:getItems()
const auto &zone = Lua::getUserdataShared<Zone>(L, 1, "Zone");
const auto &zone = Lua::getUserdataShared<Zone>(L, 1);
if (!zone) {
Lua::reportErrorFunc(Lua::getErrorDesc(LUA_ERROR_ZONE_NOT_FOUND));
Lua::pushBoolean(L, false);
Expand All @@ -267,7 +267,7 @@ int ZoneFunctions::luaZoneGetItems(lua_State* L) {

int ZoneFunctions::luaZoneRemovePlayers(lua_State* L) {
// Zone:removePlayers()
const auto &zone = Lua::getUserdataShared<Zone>(L, 1, "Zone");
const auto &zone = Lua::getUserdataShared<Zone>(L, 1);
if (!zone) {
Lua::reportErrorFunc(Lua::getErrorDesc(LUA_ERROR_ZONE_NOT_FOUND));
Lua::pushBoolean(L, false);
Expand All @@ -280,7 +280,7 @@ int ZoneFunctions::luaZoneRemovePlayers(lua_State* L) {

int ZoneFunctions::luaZoneRemoveMonsters(lua_State* L) {
// Zone:removeMonsters()
const auto &zone = Lua::getUserdataShared<Zone>(L, 1, "Zone");
const auto &zone = Lua::getUserdataShared<Zone>(L, 1);
if (!zone) {
Lua::reportErrorFunc(Lua::getErrorDesc(LUA_ERROR_ZONE_NOT_FOUND));
Lua::pushBoolean(L, false);
Expand All @@ -292,7 +292,7 @@ int ZoneFunctions::luaZoneRemoveMonsters(lua_State* L) {

int ZoneFunctions::luaZoneRemoveNpcs(lua_State* L) {
// Zone:removeNpcs()
const auto &zone = Lua::getUserdataShared<Zone>(L, 1, "Zone");
const auto &zone = Lua::getUserdataShared<Zone>(L, 1);
if (!zone) {
Lua::reportErrorFunc(Lua::getErrorDesc(LUA_ERROR_ZONE_NOT_FOUND));
Lua::pushBoolean(L, false);
Expand All @@ -304,7 +304,7 @@ int ZoneFunctions::luaZoneRemoveNpcs(lua_State* L) {

int ZoneFunctions::luaZoneSetMonsterVariant(lua_State* L) {
// Zone:setMonsterVariant(variant)
const auto &zone = Lua::getUserdataShared<Zone>(L, 1, "Zone");
const auto &zone = Lua::getUserdataShared<Zone>(L, 1);
if (!zone) {
Lua::reportErrorFunc(Lua::getErrorDesc(LUA_ERROR_ZONE_NOT_FOUND));
Lua::pushBoolean(L, false);
Expand Down Expand Up @@ -369,7 +369,7 @@ int ZoneFunctions::luaZoneGetAll(lua_State* L) {

int ZoneFunctions::luaZoneRefresh(lua_State* L) {
// Zone:refresh()
const auto &zone = Lua::getUserdataShared<Zone>(L, 1, "Zone");
const auto &zone = Lua::getUserdataShared<Zone>(L, 1);
if (!zone) {
Lua::reportErrorFunc(Lua::getErrorDesc(LUA_ERROR_ZONE_NOT_FOUND));
return 1;
Expand Down
10 changes: 5 additions & 5 deletions src/lua/functions/core/libs/kv_functions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ int KVFunctions::luaKVScoped(lua_State* L) {
const auto key = Lua::getString(L, -1);

if (Lua::isUserdata(L, 1)) {
const auto &scopedKV = Lua::getUserdataShared<KV>(L, 1, "KV");
const auto &scopedKV = Lua::getUserdataShared<KV>(L, 1);
const auto &newScope = scopedKV->scoped(key);
Lua::pushUserdata<KV>(L, newScope);
Lua::setMetatable(L, -1, "KV");
Expand All @@ -61,7 +61,7 @@ int KVFunctions::luaKVSet(lua_State* L) {
}

if (Lua::isUserdata(L, 1)) {
const auto &scopedKV = Lua::getUserdataShared<KV>(L, 1, "KV");
const auto &scopedKV = Lua::getUserdataShared<KV>(L, 1);
scopedKV->set(key, valueWrapper.value());
Lua::pushBoolean(L, true);
return 1;
Expand All @@ -82,7 +82,7 @@ int KVFunctions::luaKVGet(lua_State* L) {
key = Lua::getString(L, -2);
}
if (Lua::isUserdata(L, 1)) {
const auto &scopedKV = Lua::getUserdataShared<KV>(L, 1, "KV");
const auto &scopedKV = Lua::getUserdataShared<KV>(L, 1);
valueWrapper = scopedKV->get(key, forceLoad);
} else {
valueWrapper = g_kv().get(key, forceLoad);
Expand All @@ -100,7 +100,7 @@ int KVFunctions::luaKVRemove(lua_State* L) {
// KV.remove(key) | scopedKV:remove(key)
const auto key = Lua::getString(L, -1);
if (Lua::isUserdata(L, 1)) {
const auto &scopedKV = Lua::getUserdataShared<KV>(L, 1, "KV");
const auto &scopedKV = Lua::getUserdataShared<KV>(L, 1);
scopedKV->remove(key);
} else {
g_kv().remove(key);
Expand All @@ -119,7 +119,7 @@ int KVFunctions::luaKVKeys(lua_State* L) {
}

if (Lua::isUserdata(L, 1)) {
const auto &scopedKV = Lua::getUserdataShared<KV>(L, 1, "KV");
const auto &scopedKV = Lua::getUserdataShared<KV>(L, 1);
keys = scopedKV->keys();
} else {
keys = g_kv().keys(prefix);
Expand Down
Loading
Loading