diff --git a/src/lua/msgpack.c b/src/lua/msgpack.c index 66b83b894a0de0ad2dee78d8b20bf3d3add21d2a..2126988ebe6dbefed8397f6fd6fe41925de59c50 100644 --- a/src/lua/msgpack.c +++ b/src/lua/msgpack.c @@ -336,7 +336,11 @@ lua_msgpack_decode_cdata(lua_State *L, bool check) "a Lua string or 'char *' expected"); } if (check) { - size_t data_len = luaL_checkinteger(L, 2); + ptrdiff_t data_len = luaL_checkinteger(L, 2); + if (data_len < 0) { + return luaL_error(L, "msgpack.decode: size can't be "\ + "negative"); + } const char *p = data; if (mp_check(&p, data + data_len) != 0) return luaL_error(L, "msgpack.decode: invalid MsgPack"); diff --git a/test/app/msgpack.result b/test/app/msgpack.result index 105f503da7f8f15e046902744d2c84744e46cc67..a67c05d38a8e5e0f4996690863abbaaf3d92d4e2 100644 --- a/test/app/msgpack.result +++ b/test/app/msgpack.result @@ -244,3 +244,11 @@ size = msgpack.encode(100, buf) --- - 100 ... +-- +-- gh-4224: msgpack.decode(cdata, size) should check, that size +-- is not negative. +-- +msgpack.decode(ffi.cast('char *', '\x04\x05\x06'), -1) +--- +- error: 'msgpack.decode: size can''t be negative' +... diff --git a/test/app/msgpack.test.lua b/test/app/msgpack.test.lua index de8fd4e376e045ca2ac442aed7dbc730baf7d29a..e0880ac226436ca86c4c647872fc43558b717a58 100644 --- a/test/app/msgpack.test.lua +++ b/test/app/msgpack.test.lua @@ -78,3 +78,9 @@ buf:reset() size = msgpack.encode(100, buf) (msgpack.decode(ffi.cast('char *', buf.rpos), size)) (msgpack.decode(ffi.cast('const char *', buf.rpos), size)) + +-- +-- gh-4224: msgpack.decode(cdata, size) should check, that size +-- is not negative. +-- +msgpack.decode(ffi.cast('char *', '\x04\x05\x06'), -1)