mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 13:47:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Eliminate direct setfenv usage

Browse source
This commit is contained in:
Florian Zeitz 2012-06-08 05:04:38 +02:00
parent 217e6d011c
commit d49b9bc2ab
11 changed files with 52 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

6
util/serialization.lua
View file

@ -16,11 +16,12 @@ local pairs = pairs;
local next = next;
local loadstring = loadstring;
local setfenv = setfenv;
local pcall = pcall;
local debug_traceback = debug.traceback;
local log = require "util.logger".init("serialization");
local envload = require"util.envload".envload;
module "serialization"
local indent = function(i)
@ -84,9 +85,8 @@ end
function deserialize(str)
if type(str) ~= "string" then return nil; end
str = "return "..str;
local f, err = loadstring(str, "@data");
local f, err = envload(str, "@data", {});
if not f then return nil, err; end
setfenv(f, {});
local success, ret = pcall(f);
if not success then return nil, ret; end
return ret;