From: Mergen Imeev via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: v.shpilevoy@tarantool.org Cc: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH v1 2/2] sql: ignore \0 in string passed to Lua-function Date: Tue, 30 Mar 2021 14:21:55 +0300 [thread overview] Message-ID: <446a9874ec7289914571b7989a194939747d46a7.1617101707.git.imeevma@gmail.com> (raw) In-Reply-To: <cover.1617101707.git.imeevma@gmail.com> Prior to this patch string passed to user-defined Lua-function from SQL was cropped in case it contains '\0'. At the same time, it wasn't cropped if it is passed to the function from BOX. After this patch the string won't be cropped when passed from SQL if it contain '\0'. Closes #5938 --- src/box/sql/func.c | 3 ++- .../gh-5938-wrong-string-length.test.lua | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/box/sql/func.c b/src/box/sql/func.c index c3c14bd22..7d5a55d3f 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -120,7 +120,8 @@ port_vdbemem_dump_lua(struct port *base, struct lua_State *L, bool is_flat) lua_pushnumber(L, sql_value_double(param)); break; case MP_STR: - lua_pushstring(L, (const char *) sql_value_text(param)); + lua_pushlstring(L, (const char *) sql_value_text(param), + (size_t) sql_value_bytes(param)); break; case MP_BIN: case MP_ARRAY: diff --git a/test/sql-tap/gh-5938-wrong-string-length.test.lua b/test/sql-tap/gh-5938-wrong-string-length.test.lua index 943389e34..415fc7729 100755 --- a/test/sql-tap/gh-5938-wrong-string-length.test.lua +++ b/test/sql-tap/gh-5938-wrong-string-length.test.lua @@ -3,7 +3,7 @@ local build_path = os.getenv("BUILDDIR") package.cpath = build_path..'/test/sql-tap/?.so;'..build_path..'/test/sql-tap/?.dylib;'..package.cpath local test = require("sqltester") -test:plan(1) +test:plan(2) box.schema.func.create("gh-5938-wrong-string-length.ret_str", { language = "C", @@ -25,4 +25,21 @@ test:do_execsql_test( "This is a complete string","This is a cropped\0 string" }) +box.schema.func.create("ret_str", { + language = "Lua", + body = [[function(str) return str end]], + param_list = { "string" }, + returns = "string", + exports = { "LUA", "SQL" }, + is_deterministic = true +}) + +test:do_execsql_test( + "gh-5938-2", + [[ + SELECT "ret_str"(s) from t; + ]], { + "This is a complete string","This is a cropped\0 string" + }) + test:finish_test() -- 2.25.1
next prev parent reply other threads:[~2021-03-30 11:22 UTC|newest] Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-03-30 11:21 [Tarantool-patches] [PATCH v1 0/2] sql: ignore \0 in string passed to user function Mergen Imeev via Tarantool-patches 2021-03-30 11:21 ` [Tarantool-patches] [PATCH v1 1/2] sql: ignore \0 in string passed to C-function Mergen Imeev via Tarantool-patches 2021-03-31 20:25 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-01 8:32 ` Mergen Imeev via Tarantool-patches 2021-03-30 11:21 ` Mergen Imeev via Tarantool-patches [this message] 2021-03-31 20:25 ` [Tarantool-patches] [PATCH v1 2/2] sql: ignore \0 in string passed to Lua-function Vladislav Shpilevoy via Tarantool-patches 2021-04-01 8:41 ` Mergen Imeev via Tarantool-patches 2021-04-01 12:01 ` Mergen Imeev via Tarantool-patches 2021-04-01 19:51 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-01 22:50 ` Mergen Imeev via Tarantool-patches 2021-04-01 23:09 ` [Tarantool-patches] [PATCH v1 0/2] sql: ignore \0 in string passed to user function Vladislav Shpilevoy via Tarantool-patches 2021-04-02 7:55 ` Kirill Yukhin via Tarantool-patches
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=446a9874ec7289914571b7989a194939747d46a7.1617101707.git.imeevma@gmail.com \ --to=tarantool-patches@dev.tarantool.org \ --cc=imeevma@tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v1 2/2] sql: ignore \0 in string passed to Lua-function' \ /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