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 741362A18C for ; Tue, 23 Apr 2019 06:11:35 -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 NiZ_z7JYLHlk for ; Tue, 23 Apr 2019 06:11:35 -0400 (EDT) Received: from smtpng2.m.smailru.net (smtpng2.m.smailru.net [94.100.179.3]) (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 C56AC25112 for ; Tue, 23 Apr 2019 06:11:34 -0400 (EDT) Subject: [tarantool-patches] Re: [PATCH v1 1/1] box: fix empty tuple invalid update References: <8d2b8471b96efc182d82301808fe9ffec394ee5f.1556007413.git.kshcherbatov@tarantool.org> From: Vladislav Shpilevoy Message-ID: <231e1c1c-d33a-2132-3602-e37fa2010b8d@tarantool.org> Date: Tue, 23 Apr 2019 13:11:32 +0300 MIME-Version: 1.0 In-Reply-To: <8d2b8471b96efc182d82301808fe9ffec394ee5f.1556007413.git.kshcherbatov@tarantool.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit 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: Kirill Shcherbatov , tarantool-patches@freelists.org Hi! Thanks for the patch! On 23/04/2019 11:17, Kirill Shcherbatov wrote: > 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; A few lines above you allocate struct update_field, which is unused when field == end. Please, move this check before update->alloc(). > > /* Add first field to rope */ > mp_next(&tuple_data);