flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Made Lua API check strings strictly.

Browse Source 
Previously nil was accepted as a string in cLuaState::CheckParamString(), now it's reported as an error.
This commit is contained in:
Mattes D 2015-09-28 14:53:50 +02:00
parent 4ddff15710
commit 5614056640
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Bindings/LuaState.cpp
View File

@ -1065,7 +1065,7 @@ bool cLuaState::CheckParamString(int a_StartParam, int a_EndParam)
tolua_Error tolua_err; tolua_Error tolua_err;
for (int i = a_StartParam; i <= a_EndParam; i++) for (int i = a_StartParam; i <= a_EndParam; i++)
{ {
if (tolua_isstring(m_LuaState, i, 0, &tolua_err)) if (lua_isstring(m_LuaState, i))
{ {
continue; continue;
} }
@ -1073,6 +1073,9 @@ bool cLuaState::CheckParamString(int a_StartParam, int a_EndParam)
lua_Debug entry; lua_Debug entry;
VERIFY(lua_getstack(m_LuaState, 0, &entry)); VERIFY(lua_getstack(m_LuaState, 0, &entry));
VERIFY(lua_getinfo (m_LuaState, "n", &entry)); VERIFY(lua_getinfo (m_LuaState, "n", &entry));
tolua_err.array = 0;
tolua_err.type = "string";
tolua_err.index = i;
AString ErrMsg = Printf("#ferror in function '%s'.", (entry.name != nullptr) ? entry.name : "?"); AString ErrMsg = Printf("#ferror in function '%s'.", (entry.name != nullptr) ? entry.name : "?");
tolua_error(m_LuaState, ErrMsg.c_str(), &tolua_err); tolua_error(m_LuaState, ErrMsg.c_str(), &tolua_err);
return false; return false;