From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <alexander.turenko@tarantool.org>
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 dev.tarantool.org (Postfix) with ESMTPS id 286EC40F3AE
 for <tarantool-patches@dev.tarantool.org>;
 Sun, 21 Jun 2020 21:29:29 +0300 (MSK)
Date: Sun, 21 Jun 2020 21:28:39 +0300
From: Alexander Turenko <alexander.turenko@tarantool.org>
Message-ID: <20200621182839.e7xihfsncu26yepi@tkn_work_nb>
References: <cover.1592416673.git.alexander.turenko@tarantool.org>
 <e66291b80cb7ad79d82c7ac7ca5824fdc45000d3.1592416673.git.alexander.turenko@tarantool.org>
 <5d6cb725-c661-27b2-f527-ebadf6d052c6@tarantool.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <5d6cb725-c661-27b2-f527-ebadf6d052c6@tarantool.org>
Subject: Re: [Tarantool-patches] [PATCH v2 1/3] merger: fix NULL dereference
 when called via iproto
List-Id: Tarantool development patches <tarantool-patches.dev.tarantool.org>
List-Unsubscribe: <https://lists.tarantool.org/mailman/options/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=unsubscribe>
List-Archive: <https://lists.tarantool.org/pipermail/tarantool-patches/>
List-Post: <mailto:tarantool-patches@dev.tarantool.org>
List-Help: <mailto:tarantool-patches-request@dev.tarantool.org?subject=help>
List-Subscribe: <https://lists.tarantool.org/mailman/listinfo/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=subscribe>
To: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org

On Sat, Jun 20, 2020 at 01:32:17AM +0200, Vladislav Shpilevoy wrote:
> > diff --git a/src/box/lua/merger.c b/src/box/lua/merger.c
> > index 1b155152b..f72e70ee8 100644
> > --- a/src/box/lua/merger.c
> > +++ b/src/box/lua/merger.c
> > @@ -764,7 +884,7 @@ luaL_merge_source_tuple_new(struct lua_State *L)
> >   */
> >  static int
> >  luaL_merge_source_tuple_fetch(struct merge_source_tuple *source,
> > -			       struct lua_State *L)
> > +			      struct lua_State *L)
> 
> This hunk seems to be unnecessary.

Thanks for noticing!

Fixed.