blocky_portaling/mesecons
1
0
Fork 0
forked from Mirrorlandia_minetest/mesecons
Code Issues Pull Requests Projects Releases Wiki Activity

Luacontroller: Fix function usage in LuaJIT, make 'do' no longer

Browse Source 
prohibited, remove pcall and xpcall, fix global lookup of "jit"
variable, correct error locations

Thanks to @ShadowNinja and @gamemanj for fixing this in #241
This commit is contained in:
Jeija 2016-03-13 13:43:55 +01:00
parent e5dba66c21
commit 08b14e3af0
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
mesecons_luacontroller/init.lua
View File

@ -249,8 +249,8 @@ end
local safe_globals = { local safe_globals = {
"assert", "error", "ipairs", "next", "pairs", "pcall", "select", "assert", "error", "ipairs", "next", "pairs", "select",
"tonumber", "tostring", "type", "unpack", "_VERSION", "xpcall", "tonumber", "tostring", "type", "unpack", "_VERSION"
} }
local function create_environment(pos, mem, event) local function create_environment(pos, mem, event)
-- Gather variables for the environment -- Gather variables for the environment
@ -340,17 +340,17 @@ end
local function timeout() local function timeout()
debug.sethook() -- Clear hook debug.sethook() -- Clear hook
error("Code timed out!") error("Code timed out!", 2)
end end
local function code_prohibited(code) local function code_prohibited(code)
-- LuaJIT doesn't increment the instruction counter when running -- LuaJIT doesn't increment the instruction counter when running
-- loops, so we have to sanitize inputs if we're using LuaJIT. -- loops, so we have to sanitize inputs if we're using LuaJIT.
if not jit then if not rawget(_G, "jit") then
return false return false
end end
local prohibited = {"while", "for", "do", "repeat", "until", "goto"} local prohibited = {"while", "for", "repeat", "until", "goto"}
code = " "..code.." " code = " "..code.." "
for _, p in ipairs(prohibited) do for _, p in ipairs(prohibited) do
if string.find(code, "[^%w_]"..p.."[^%w_]") then if string.find(code, "[^%w_]"..p.."[^%w_]") then
@ -369,10 +369,26 @@ local function create_sandbox(code, env)
setfenv(f, env) setfenv(f, env)
return function(...) return function(...)
debug.sethook(timeout, "", 10000) -- Normal Lua: Use instruction counter to stop execution
-- after luacontroller_maxevents.
-- LuaJIT: Count function calls instead of instructions, allows usage
-- of function keyword. However, LuaJIT still doesn't trigger
-- lines events when using infinite loops.
local maxevents = mesecon.setting("luacontroller_maxevents", 10000)
if not rawget(_G, "jit") then
debug.sethook(timeout, "", maxevents)
else
local events = 0
debug.sethook(function ()
events = events + 1
if events > maxevents then
timeout()
end
end, "c")
end
local ok, ret = pcall(f, ...) local ok, ret = pcall(f, ...)
debug.sethook() -- Clear hook debug.sethook() -- Clear hook
if not ok then error(ret) end if not ok then error(ret, 0) end
return ret return ret
end end
end end