0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

enabled os.clock, os.date and os.difftime

Browse source 
Note that silene had agreed in enabling these.

This commtit makes g++ on Linux throw a warning for the lua upstream
code which should probably be fixed by adding the define
"LUA_USE_MKSTEMP"
This commit is contained in:
Anonymissimus 2011-06-12 16:36:08 +00:00
parent 012d7c5408
commit bdf59593cc
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/scripting/lua.cpp
View file

@ -3223,12 +3223,14 @@ LuaKernel::LuaKernel(const config &cfg)
lua_State *L = mState;
// Open safe libraries. (Debug is not, but it will be closed below.)
// os also isn't but most of its functions will be disabled below
static const luaL_Reg safe_libs[] = {
{ "", luaopen_base },
{ "table", luaopen_table },
{ "string", luaopen_string },
{ "math", luaopen_math },
{ "debug", luaopen_debug },
{ "os", luaopen_os },
{ NULL, NULL }
};
for (luaL_Reg const *lib = safe_libs; lib->func; ++lib)
@ -3470,6 +3472,19 @@ LuaKernel::LuaKernel(const config &cfg)
lua_pushnil(L);
lua_setglobal(L, "debug");
// Disable functions from os which we don't want.
lua_getglobal(L, "os");
lua_pushnil(L);
while(lua_next(L, -2) != 0) {
lua_pop(L, 1);
char const* function = lua_tostring(L, -1);
if(strcmp(function, "clock") == 0 || strcmp(function, "date") == 0
|| strcmp(function, "difftime") == 0) continue;
lua_pushnil(L);
lua_setfield(L, -3, function);
}
lua_pop(L, 1);
lua_settop(L, 0);
}