diff --git a/src/lua/msgpackffi.lua b/src/lua/msgpackffi.lua index bfeedbc4b8676acef345f120d96d6ff91f260a10..75fcc5ba01fd32209f36c36d97b1ed4bceede2e8 100644 --- a/src/lua/msgpackffi.lua +++ b/src/lua/msgpackffi.lua @@ -4,7 +4,6 @@ local ffi = require('ffi') local buffer = require('buffer') local builtin = ffi.C local msgpack = require('msgpack') -- .NULL, .array_mt, .map_mt, .cfg -local MAXNESTING = 16 local int8_ptr_t = ffi.typeof('int8_t *') local uint8_ptr_t = ffi.typeof('uint8_t *') local uint16_ptr_t = ffi.typeof('uint16_t *') @@ -206,7 +205,7 @@ local function encode_r(buf, obj, level) elseif type(obj) == "string" then encode_str(buf, obj) elseif type(obj) == "table" then - if level >= MAXNESTING then -- Limit nested tables + if level >= msgpack.cfg.encode_max_depth then encode_nil(buf) return end diff --git a/test/app-tap/msgpackffi.test.lua b/test/app-tap/msgpackffi.test.lua index f9646335b3bded4424312ee613b2b69b958fb26d..7277a5b89fd6b30ab2d37702a9b20f143fbfc922 100755 --- a/test/app-tap/msgpackffi.test.lua +++ b/test/app-tap/msgpackffi.test.lua @@ -36,7 +36,7 @@ local function test_offsets(test, s) end local function test_other(test, s) - test:plan(19) + test:plan(23) local buf = string.char(0x93, 0x6e, 0xcb, 0x42, 0x2b, 0xed, 0x30, 0x47, 0x6f, 0xff, 0xff, 0xac, 0x77, 0x6b, 0x61, 0x71, 0x66, 0x7a, 0x73, 0x7a, 0x75, 0x71, 0x71, 0x78) @@ -68,6 +68,44 @@ local function test_other(test, s) test:is(#s.encode(-0x8001), 5, "len(encode(-0x8001))") test:is(#s.encode(-0x80000000), 5, "len(encode(-0x80000000))") test:is(#s.encode(-0x80000001), 9, "len(encode(-0x80000001))") + + -- + -- gh-4434: msgpackffi does not care about msgpack serializer + -- configuration, but it should. + -- + local function check_depth(depth_to_try) + local t = nil + for i = 1, depth_to_try do t = {t} end + t = s.decode_unchecked(s.encode(t)) + local level = 0 + while t ~= nil do level = level + 1 t = t[1] end + return level + end + local msgpack = require('msgpack') + local max_depth = msgpack.cfg.encode_max_depth + local result_depth = check_depth(max_depth + 5) + test:is(result_depth, max_depth, + "msgpackffi uses msgpack.cfg.encode_max_depth") + + msgpack.cfg({encode_max_depth = max_depth + 5}) + result_depth = check_depth(max_depth + 5) + test:is(result_depth, max_depth + 5, "and uses it dynamically") + + -- Recursive tables are handled correctly. + local level = 0 + local t = {} + t[1] = t + t = s.decode(s.encode(t)) + while t ~= nil do level = level + 1 t = t[1] end + test:is(level, max_depth + 5, "recursive array") + t = {} + t.key = t + t = s.decode(s.encode(t)) + level = 0 + while t ~= nil do level = level + 1 t = t.key end + test:is(level, max_depth + 5, "recursive map") + + msgpack.cfg({encode_max_depth = max_depth}) end tap.test("msgpackffi", function(test)