From 4b95d4541b9e16c5e351eddaf1b0e883ed06c59d Mon Sep 17 00:00:00 2001 From: Jokler Date: Sat, 6 Jul 2019 03:39:02 +0200 Subject: Factoid: Move sandbox hooks to rust & drop unsafe --- src/plugins/factoid/sandbox.lua | 27 --------------------------- 1 file changed, 27 deletions(-) (limited to 'src/plugins/factoid/sandbox.lua') diff --git a/src/plugins/factoid/sandbox.lua b/src/plugins/factoid/sandbox.lua index a927535..108a30d 100644 --- a/src/plugins/factoid/sandbox.lua +++ b/src/plugins/factoid/sandbox.lua @@ -90,35 +90,8 @@ end sandbox_env.eval = eval sandbox_env.sleep = safesleep --- Check if the factoid timed out -function checktime() - if os.time() - time >= timeout then - error("Timed out after " .. timeout .. " seconds", 0) - else - -- Limit the cpu usage of factoids - sleep(1) - end -end - --- Check if the factoid uses too much memory -function checkmem() - if collectgarbage("count") > maxmem then - error("Factoid used over " .. maxmem .. " kbyte of ram") - end -end - local f, e = load(factoid, nil, nil, sandbox_env) --- Add timeout hook -time = os.time() --- The timeout is defined in seconds -timeout = 30 -debug.sethook(checktime, "l") --- Add memory check hook --- The max memory is defined in kilobytes -maxmem = 1000 -debug.sethook(checkmem, "l") - if f then f() else -- cgit v1.2.3-70-g09d2