MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3742 from lethosor/fix-luaapi-tostring 

Fix unchecked lua_tostring calls
develop
Myk 2023-09-06 16:07:19 -07:00 committed by GitHub
parent 73df72ce62 337260ab0c
commit 0bd0a82a3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/LuaApi.cpp
Unescape Escape View File

@ -1368,8 +1368,8 @@ static CommandHistory * ensureCommandHistory(std::string id,
static int getCommandHistory(lua_State *state) static int getCommandHistory(lua_State *state)
{ {
std::string id = lua_tostring(state, 1); std::string id = luaL_checkstring(state, 1);
std::string src_file = lua_tostring(state, 2); std::string src_file = luaL_checkstring(state, 2);
std::vector<std::string> entries; std::vector<std::string> entries;
ensureCommandHistory(id, src_file)->getEntries(entries); ensureCommandHistory(id, src_file)->getEntries(entries);
Lua::PushVector(state, entries); Lua::PushVector(state, entries);
@ -2030,7 +2030,7 @@ static int units_getCitizens(lua_State *L) {
} }
static int units_getUnitsByNobleRole(lua_State *L) { static int units_getUnitsByNobleRole(lua_State *L) {
std::string role_name = lua_tostring(L, -1); std::string role_name = luaL_checkstring(L, -1);
std::vector<df::unit *> units; std::vector<df::unit *> units;
Units::getUnitsByNobleRole(units, role_name); Units::getUnitsByNobleRole(units, role_name);
Lua::PushVector(L, units); Lua::PushVector(L, units);