Fixed: datamanager.store and datamanager.load could crash when username or host argum...

diff --git a/util/datamanager.lua b/util/datamanager.lua
index 1deb6b3d6c2578bc48c073086b81895ba7fc0abd..f4ae958c702e5b4ec36aa9550e6785b3c00c18c8 100644 (file)
--- a/util/datamanager.lua
+++ b/util/datamanager.lua
@@ -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();