library-mirrors/serpent
1
0
Fork 0
mirror of https://github.com/pkulchenko/serpent.git synced 2024-11-21 23:24:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added protection from __serialize check failing (pkulchenko/ZeroBraneStudio#732).

Browse Source 
This protects from run-time error `field or property __serialize does not exist`
on `getmetatable(t).__serialize` check in some Lua engines (for example, Unity).
This commit is contained in:
Paul Kulchenko 2017-02-16 21:36:40 -08:00
parent 545c8fc8a6
commit 9f48b55391
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/serpent.lua
View File

@ -1,4 +1,4 @@
local n, v = "serpent", 0.285 -- (C) 2012-15 Paul Kulchenko; MIT License local n, v = "serpent", 0.286 -- (C) 2012-15 Paul Kulchenko; MIT License
local c, d = "Paul Kulchenko", "Lua serializer and pretty printer" local c, d = "Paul Kulchenko", "Lua serializer and pretty printer"
local snum = {[tostring(1/0)]='1/0 --[[math.huge]]',[tostring(-1/0)]='-1/0 --[[-math.huge]]',[tostring(0/0)]='0/0'} local snum = {[tostring(1/0)]='1/0 --[[math.huge]]',[tostring(-1/0)]='-1/0 --[[-math.huge]]',[tostring(0/0)]='0/0'}
local badtype = {thread = true, userdata = true, cdata = true} local badtype = {thread = true, userdata = true, cdata = true}
@ -49,11 +49,15 @@ local function s(t, opts)
sref[#sref+1] = spath..space..'='..space..seen[t] sref[#sref+1] = spath..space..'='..space..seen[t]
return tag..'nil'..comment('ref', level) end return tag..'nil'..comment('ref', level) end
-- protect from those cases where __tostring may fail -- protect from those cases where __tostring may fail
if type(mt) == 'table' and pcall(function() return mt.__tostring and mt.__tostring(t) end) if type(mt) == 'table' then
and (mt.__serialize or mt.__tostring) then -- knows how to serialize itself local to, tr = pcall(function() return mt.__tostring(t) end)
local so, sr = pcall(function() return mt.__serialize(t) end)
if (to or so) then -- knows how to serialize itself
seen[t] = insref or spath seen[t] = insref or spath
if mt.__serialize then t = mt.__serialize(t) else t = tostring(t) end if so then t = sr else t = tostring(t) end
ttype = type(t) end -- new value falls through to be serialized ttype = type(t)
end -- new value falls through to be serialized
end
if ttype == "table" then if ttype == "table" then
if level >= maxl then return tag..'{}'..comment('max', level) end if level >= maxl then return tag..'{}'..comment('max', level) end
seen[t] = insref or spath seen[t] = insref or spath