util.sql: Make set_encoding() return failure of SET NAMES

[prosody.git] / util / serialization.lua

diff --git a/util/serialization.lua b/util/serialization.lua
index 474b5d655c285248330b06ae673843c3bfdc6662..049011356cbbe0c9c892d89b9e79745df3d40a64 100644 (file)
--- a/util/serialization.lua
+++ b/util/serialization.lua
@@ -1,7 +1,7 @@
 -- Prosody IM
 -- Copyright (C) 2008-2010 Matthew Wild
 -- Copyright (C) 2008-2010 Waqas Hussain
--- 
+--
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
@@ -11,16 +11,15 @@ local type = type;
 local tostring = tostring;
 local t_insert = table.insert;
 local t_concat = table.concat;
-local error = error;
 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)
@@ -28,14 +27,20 @@ local indent = function(i)
 end
 local function basicSerialize (o)
        if type(o) == "number" or type(o) == "boolean" then
-               return tostring(o);
+               -- no need to check for NaN, as that's not a valid table index
+               if o == 1/0 then return "(1/0)";
+               elseif o == -1/0 then return "(-1/0)";
+               else return tostring(o); end
        else -- assume it is a string -- FIXME make sure it's a string. throw an error otherwise.
                return (("%q"):format(tostring(o)):gsub("\\\n", "\\n"));
        end
 end
 local function _simplesave(o, ind, t, func)
        if type(o) == "number" then
-               func(t, tostring(o));
+               if o ~= o then func(t, "(0/0)");
+               elseif o == 1/0 then func(t, "(1/0)");
+               elseif o == -1/0 then func(t, "(-1/0)");
+               else func(t, tostring(o)); end
        elseif type(o) == "string" then
                func(t, (("%q"):format(o):gsub("\\\n", "\\n")));
        elseif type(o) == "table" then
@@ -78,9 +83,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;