From d2906893e8c5aaab000cdd150c2be6ce4f453190 Mon Sep 17 00:00:00 2001 From: antirez Date: Fri, 13 Apr 2012 13:36:08 +0200 Subject: [PATCH] mt.declared is no longer needed. Lua global protection can now be simpified becuase we no longer have the global() function. It's useless to occupy memory with this table, it is also not faster because the metamethods we use are only called when a global object does not exist or we are trying to create it from a script. --- src/scripting.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/scripting.c b/src/scripting.c index ae906c68..76b25ad2 100644 --- a/src/scripting.c +++ b/src/scripting.c @@ -426,19 +426,17 @@ void scriptingEnableGlobalsProtection(lua_State *lua) { * Modified to be adapted to Redis. */ s[j++]="local mt = {}\n"; s[j++]="setmetatable(_G, mt)\n"; - s[j++]="mt.declared = {}\n"; s[j++]="mt.__newindex = function (t, n, v)\n"; - s[j++]=" if not mt.declared[n] and debug.getinfo(2) then\n"; + s[j++]=" if debug.getinfo(2) then\n"; s[j++]=" local w = debug.getinfo(2, \"S\").what\n"; s[j++]=" if w ~= \"main\" and w ~= \"C\" then\n"; s[j++]=" error(\"Script attempted to create global variable '\"..tostring(n)..\"'\", 2)\n"; s[j++]=" end\n"; - s[j++]=" mt.declared[n] = true\n"; s[j++]=" end\n"; s[j++]=" rawset(t, n, v)\n"; s[j++]="end\n"; s[j++]="mt.__index = function (t, n)\n"; - s[j++]=" if debug.getinfo(2) and not mt.declared[n] and debug.getinfo(2, \"S\").what ~= \"C\" then\n"; + s[j++]=" if debug.getinfo(2) and debug.getinfo(2, \"S\").what ~= \"C\" then\n"; s[j++]=" error(\"Script attempted to access unexisting global variable '\"..n..\"'\", 2)\n"; s[j++]=" end\n"; s[j++]=" return rawget(t, n)\n"; -- 2.47.2