From: Roman Khabibov <roman.habibov@tarantool.org> To: tarantool-patches@dev.tarantool.org Cc: alexander.turenko@tarantool.org Subject: [Tarantool-patches] [PATCH] serializer: check for recursive serialization Date: Tue, 17 Nov 2020 19:40:12 +0300 [thread overview] Message-ID: <20201117164012.14652-1-roman.habibov@tarantool.org> (raw) Print error if object after serialization is the same. Closes #3228 --- Branch: https://github.com/tarantool/tarantool/tree/romanhabibov/serialize-check Issue: https://github.com/tarantool/tarantool/issues/3228 @ChangeLog: * Fix bug with bus error when __serialize function generates infinite recursion (gh-3228). src/lua/utils.c | 5 +++++ ...-3228-serializer-look-for-recursion.result | 19 +++++++++++++++++++ ...228-serializer-look-for-recursion.test.lua | 8 ++++++++ 3 files changed, 32 insertions(+) create mode 100644 test/app/gh-3228-serializer-look-for-recursion.result create mode 100644 test/app/gh-3228-serializer-look-for-recursion.test.lua diff --git a/src/lua/utils.c b/src/lua/utils.c index 23fbdd4ad..d12f3675a 100644 --- a/src/lua/utils.c +++ b/src/lua/utils.c @@ -508,6 +508,11 @@ lua_field_try_serialize(struct lua_State *L, struct luaL_serializer *cfg, diag_set(LuajitError, lua_tostring(L, -1)); return -1; } + if (lua_rawequal(L, -2, -1) == 1) { + diag_set(LuajitError, "Bad __serialize function. It " + "can't return the same value."); + return -1; + } if (luaL_tofield(L, cfg, NULL, -1, field) != 0) return -1; lua_replace(L, idx); diff --git a/test/app/gh-3228-serializer-look-for-recursion.result b/test/app/gh-3228-serializer-look-for-recursion.result new file mode 100644 index 000000000..cd86ab06a --- /dev/null +++ b/test/app/gh-3228-serializer-look-for-recursion.result @@ -0,0 +1,19 @@ +-- test-run result file version 2 +test_run = require('test_run').new() + | --- + | ... + +-- +-- gh-3228: Check the error message in the case of a __serialize +-- function generating infinite recursion. +-- +setmetatable({}, {__serialize = function(a) return a end}) + | --- + | - error: 'console: an exception occurred when formatting the output: Bad __serialize + | function. It can''t return the same value.' + | ... +setmetatable({}, {__serialize = function(a, b, c) return a, b, c end}) + | --- + | - error: 'console: an exception occurred when formatting the output: Bad __serialize + | function. It can''t return the same value.' + | ... diff --git a/test/app/gh-3228-serializer-look-for-recursion.test.lua b/test/app/gh-3228-serializer-look-for-recursion.test.lua new file mode 100644 index 000000000..d3c76ef0c --- /dev/null +++ b/test/app/gh-3228-serializer-look-for-recursion.test.lua @@ -0,0 +1,8 @@ +test_run = require('test_run').new() + +-- +-- gh-3228: Check the error message in the case of a __serialize +-- function generating infinite recursion. +-- +setmetatable({}, {__serialize = function(a) return a end}) +setmetatable({}, {__serialize = function(a, b, c) return a, b, c end}) -- 2.24.3 (Apple Git-128)
next reply other threads:[~2020-11-17 16:40 UTC|newest] Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-17 16:40 Roman Khabibov [this message] 2020-11-23 20:28 ` Igor Munkin 2020-11-24 1:51 ` roman 2020-12-02 0:53 ` Roman Khabibov 2020-12-08 16:59 ` Sergey Ostanevich 2020-12-08 17:25 ` Igor Munkin 2020-12-11 3:22 ` Roman Khabibov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20201117164012.14652-1-roman.habibov@tarantool.org \ --to=roman.habibov@tarantool.org \ --cc=alexander.turenko@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH] serializer: check for recursive serialization' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox