From: Kirill Shcherbatov <kshcherbatov@tarantool.org>
To: tarantool-patches@freelists.org, v.shpilevoy@tarantool.org
Cc: Kirill Shcherbatov <kshcherbatov@tarantool.org>
Subject: [tarantool-patches] [PATCH v1 1/1] box: fix empty tuple invalid update
Date: Tue, 23 Apr 2019 11:17:45 +0300 [thread overview]
Message-ID: <8d2b8471b96efc182d82301808fe9ffec394ee5f.1556007413.git.kshcherbatov@tarantool.org> (raw)
The tuple:update() used to work incorrectly in case of empty
tuple produced with box.tuple.new{} because update_create_rope
unconditionally initialized a new rope with [tuple_data,
mp_next(tuple_data)] field that might not exists.
Closes #4041
---
http://github.com/tarantool/tarantool/tree/kshch/gh-4041-empty-tuple-update
https://github.com/tarantool/tarantool/issues/4041
src/box/tuple_update.c | 2 ++
test/box/tuple.result | 21 +++++++++++++++++++++
test/box/tuple.test.lua | 10 ++++++++++
3 files changed, 33 insertions(+)
diff --git a/src/box/tuple_update.c b/src/box/tuple_update.c
index 01c55fb1a..849073258 100644
--- a/src/box/tuple_update.c
+++ b/src/box/tuple_update.c
@@ -834,6 +834,8 @@ update_create_rope(struct tuple_update *update, const char *tuple_data,
return -1;
const char *field = tuple_data;
const char *end = tuple_data_end;
+ if (field == end)
+ return 0;
/* Add first field to rope */
mp_next(&tuple_data);
diff --git a/test/box/tuple.result b/test/box/tuple.result
index 82ad8404d..2561ebc35 100644
--- a/test/box/tuple.result
+++ b/test/box/tuple.result
@@ -859,6 +859,27 @@ t
t = nil
---
...
+--
+-- gh-4041: Invalid field on empty tuple update.
+--
+t = box.tuple.new{}
+---
+...
+t:update({{'=', 1, 1}})
+---
+- [1]
+...
+t:upsert({{'=', 1, 1}})
+---
+- [1]
+...
+t:update({{'+', 1, 1}})
+---
+- error: Field 1 was not found in the tuple
+...
+t = nil
+---
+...
--------------------------------------------------------------------------------
-- test msgpack.encode + tuple
--------------------------------------------------------------------------------
diff --git a/test/box/tuple.test.lua b/test/box/tuple.test.lua
index 8030b0884..b0a4ab173 100644
--- a/test/box/tuple.test.lua
+++ b/test/box/tuple.test.lua
@@ -270,6 +270,16 @@ t = box.tuple.new(require('yaml').decode("[17711728, {1000: 'xxx'}]"))
t:update({{'=', 2, t[2]}})
t
t = nil
+
+--
+-- gh-4041: Invalid field on empty tuple update.
+--
+t = box.tuple.new{}
+t:update({{'=', 1, 1}})
+t:upsert({{'=', 1, 1}})
+t:update({{'+', 1, 1}})
+t = nil
+
--------------------------------------------------------------------------------
-- test msgpack.encode + tuple
--------------------------------------------------------------------------------
--
2.21.0
next reply other threads:[~2019-04-23 8:17 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-23 8:17 Kirill Shcherbatov [this message]
2019-04-23 10:11 ` [tarantool-patches] " Vladislav Shpilevoy
2019-04-23 10:17 ` Kirill Shcherbatov
2019-04-23 10:20 ` Vladislav Shpilevoy
2019-04-23 10:30 ` Kirill Yukhin
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=8d2b8471b96efc182d82301808fe9ffec394ee5f.1556007413.git.kshcherbatov@tarantool.org \
--to=kshcherbatov@tarantool.org \
--cc=tarantool-patches@freelists.org \
--cc=v.shpilevoy@tarantool.org \
--subject='Re: [tarantool-patches] [PATCH v1 1/1] box: fix empty tuple invalid update' \
/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