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

Handle invalid arguments to runCommand

develop
lethosor 2014-06-16 11:40:26 -04:00
parent d538e13450
commit fb922fab37
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
library/LuaApi.cpp
Unescape Escape View File

@ -2236,7 +2236,8 @@ static int internal_runCommand(lua_State *L)
{ {
lua_pushstring(L, ""); lua_pushstring(L, "");
} }
if (lua_type(L, 1) == LUA_TTABLE) int type_1 = lua_type(L, 1);
if (type_1 == LUA_TTABLE)
{ {
std::string command = ""; std::string command = "";
std::vector<std::string> args; std::vector<std::string> args;
@ -2252,12 +2253,18 @@ static int internal_runCommand(lua_State *L)
CoreSuspender suspend; CoreSuspender suspend;
res = Core::getInstance().runCommand(out, command, args); res = Core::getInstance().runCommand(out, command, args);
} }
else else if (type_1 == LUA_TSTRING)
{ {
std::string command = lua_tostring(L, 1); std::string command = lua_tostring(L, 1);
CoreSuspender suspend; CoreSuspender suspend;
res = Core::getInstance().runCommand(out, command); res = Core::getInstance().runCommand(out, command);
} }
else
{
lua_pushnil(L);
lua_pushfstring(L, "Expected table, got %s", lua_typename(L, type_1));
return 2;
}
auto fragments = out.fragments(); auto fragments = out.fragments();
lua_newtable(L); lua_newtable(L);
lua_pushinteger(L, (int)res); lua_pushinteger(L, (int)res);