From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id 04A3D29D8C for ; Tue, 23 Apr 2019 04:17:51 -0400 (EDT) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OWVM120V50Rg for ; Tue, 23 Apr 2019 04:17:50 -0400 (EDT) Received: from smtp40.i.mail.ru (smtp40.i.mail.ru [94.100.177.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id 4B78029D8A for ; Tue, 23 Apr 2019 04:17:50 -0400 (EDT) From: Kirill Shcherbatov Subject: [tarantool-patches] [PATCH v1 1/1] box: fix empty tuple invalid update Date: Tue, 23 Apr 2019 11:17:45 +0300 Message-Id: <8d2b8471b96efc182d82301808fe9ffec394ee5f.1556007413.git.kshcherbatov@tarantool.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-Help: List-Unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-Subscribe: List-Owner: List-post: List-Archive: To: tarantool-patches@freelists.org, v.shpilevoy@tarantool.org Cc: Kirill Shcherbatov 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