From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <tarantool-patches-bounce@freelists.org>
Received: from localhost (localhost [127.0.0.1])
	by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id DE06D2B588
	for <tarantool-patches@freelists.org>; Thu, 12 Apr 2018 07:58:21 -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 0Kbmmso8cY5j for <tarantool-patches@freelists.org>;
	Thu, 12 Apr 2018 07:58:21 -0400 (EDT)
Received: from smtp58.i.mail.ru (smtp58.i.mail.ru [217.69.128.38])
	(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 99C1A2B4F9
	for <tarantool-patches@freelists.org>; Thu, 12 Apr 2018 07:58:21 -0400 (EDT)
Subject: [tarantool-patches] Re: [PATCH 1/2] sql: fix tuple format leak
References: <cover.1523468339.git.korablev@tarantool.org>
 <8d8d9f3056d4af42638ab403de6f19d2eb76f07a.1523468339.git.korablev@tarantool.org>
From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
Message-ID: <b2b9ed52-14ee-f1ee-4e88-792319296a16@tarantool.org>
Date: Thu, 12 Apr 2018 14:58:13 +0300
MIME-Version: 1.0
In-Reply-To: <8d8d9f3056d4af42638ab403de6f19d2eb76f07a.1523468339.git.korablev@tarantool.org>
Content-Type: text/plain; charset=utf-8; format=flowed
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: <mailto:ecartis@freelists.org?Subject=help>
List-unsubscribe: <tarantool-patches-request@freelists.org?Subject=unsubscribe>
List-software: Ecartis version 1.0.0
List-Id: tarantool-patches <tarantool-patches.freelists.org>
List-subscribe: <tarantool-patches-request@freelists.org?Subject=subscribe>
List-owner: <mailto:>
List-post: <mailto:tarantool-patches@freelists.org>
List-archive: <http://www.freelists.org/archives/tarantool-patches>
To: tarantool-patches@freelists.org, Nikita Pettik <korablev@tarantool.org>

Hello. Thank you for contributing! See below 3 comments.

> diff --git a/src/box/sql.c b/src/box/sql.c
> index a6713f1f0..dd0cfcc1a 100644
> --- a/src/box/sql.c
> +++ b/src/box/sql.c
> @@ -451,17 +451,13 @@ int tarantoolSqlite3EphemeralCreate(BtCursor *pCur, uint32_t field_count,
>    *
>    * @retval SQLITE_OK on success, SQLITE_TARANTOOL_ERROR otherwise.
>    */
> -int tarantoolSqlite3EphemeralInsert(BtCursor *pCur)
> +int tarantoolSqlite3EphemeralInsert(struct space *space, char *tuple,
> +				    char *tuple_end)

1. Please, update the comment as well. And lets move it to a header, as 
it is done in tarantool core.

>   {
> -	assert(pCur);
> -	assert(pCur->curFlags & BTCF_TEphemCursor);
> -	mp_tuple_assert(pCur->key, pCur->key + pCur->nKey);
> -
> -	if (space_ephemeral_replace(pCur->space, pCur->key,
> -				    pCur->key + pCur->nKey) != 0) {
> -		diag_log();
> +	assert(space != NULL);
> +	mp_tuple_assert(tuple, tuple_end);
> +	if (space_ephemeral_replace(space, tuple, tuple_end) != 0)
>   		return SQL_TARANTOOL_INSERT_FAIL;
> -	}
>   	return SQLITE_OK;
>   }
>   
> @@ -475,28 +471,29 @@ int tarantoolSqlite3EphemeralDrop(BtCursor *pCur)
>   }
>   
>   static inline int
> -insertOrReplace(BtCursor *pCur, enum iproto_type type)
> +insertOrReplace(struct space *space, char *tuple, char *tuple_end,
> +		enum iproto_type type)

2. Please, make a pointer be const, if it is not changed. Here it is 
const. Const specifier helps compiler to do more accurate optimization.

> -int tarantoolSqlite3Insert(BtCursor *pCur)
> +int tarantoolSqlite3Insert(struct space *space, char *tuple, char *tuple_end)
>   {
> -	return insertOrReplace(pCur, IPROTO_INSERT);
> +	return insertOrReplace(space, tuple, tuple_end, IPROTO_INSERT);
>   }
>   
> -int tarantoolSqlite3Replace(BtCursor *pCur)
> +int tarantoolSqlite3Replace(struct space *space, char *tuple, char *tuple_end)

3. Same.