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

Fixed: datamanager.store and datamanager.load could crash when username or host arguments were nil. (useful for server specific and global data).

Browse source
This commit is contained in:
Waqas Hussain 2008-10-23 02:49:43 +05:00
parent 9bcfe122c0
commit c3ca55e019
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
util/datamanager.lua
View file

@ -68,16 +68,25 @@ end
function load(username, host, datastore)
local data, ret = loadfile(getpath(username, host, datastore));
if not data then log("warn", "Failed to load "..datastore.." storage ('"..ret.."') for user: "..username.."@"..host); return nil; end
if not data then
log("warn", "Failed to load "..datastore.." storage ('"..ret.."') for user: "..(username or nil).."@"..(host or nil));
return nil;
end
setfenv(data, {});
local success, ret = pcall(data);
if not success then log("error", "Unable to load "..datastore.." storage ('"..ret.."') for user: "..username.."@"..host); return nil; end
if not success then
log("error", "Unable to load "..datastore.." storage ('"..ret.."') for user: "..(username or nil).."@"..(host or nil));
return nil;
end
return ret;
end
function store(username, host, datastore, data)
local f, msg = io_open(getpath(username, host, datastore), "w+");
if not f then log("error", "Unable to write to "..datastore.." storage ('"..msg.."') for user: "..username.."@"..host); return nil; end
if not f then
log("error", "Unable to write to "..datastore.." storage ('"..msg.."') for user: "..(username or nil).."@"..(host or nil));
return nil;
end
f:write("return ");
simplesave(f, data);
f:close();