From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <v.shpilevoy@tarantool.org>
Received: from smtp63.i.mail.ru (smtp63.i.mail.ru [217.69.128.43])
 (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 50FBC4696C4
 for <tarantool-patches@dev.tarantool.org>;
 Thu, 19 Dec 2019 03:32:03 +0300 (MSK)
References: <cover.1575627361.git.i.kosarev@tarantool.org>
 <efaf12866c7a49ccef04843026b3d82d8aaf01d6.1575627361.git.i.kosarev@tarantool.org>
From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
Message-ID: <778b82e9-d925-4b55-003c-c4c6e88a4b99@tarantool.org>
Date: Thu, 19 Dec 2019 01:32:01 +0100
MIME-Version: 1.0
In-Reply-To: <efaf12866c7a49ccef04843026b3d82d8aaf01d6.1575627361.git.i.kosarev@tarantool.org>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Subject: Re: [Tarantool-patches] [PATCH 1/3] b-tree: return NULL on
 matras_alloc fail
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: Ilya Kosarev <i.kosarev@tarantool.org>, tarantool-patches@dev.tarantool.org

Hi! Thanks for the patch!

On 13/12/2019 08:05, Ilya Kosarev wrote:
> In bps_tree_create_leaf we use matras_alloc in case
> bps_tree_garbage_pop didn't work out. However it also might not
> succeed. Then we need to return NULL instead of dereferencing NULL
> pointer.
> 
> Prerequisites: #3807
> ---
>  src/lib/salad/bps_tree.h | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/src/lib/salad/bps_tree.h b/src/lib/salad/bps_tree.h
> index d28b53f53c8..51f5c8b5556 100644
> --- a/src/lib/salad/bps_tree.h
> +++ b/src/lib/salad/bps_tree.h
> @@ -2149,6 +2149,8 @@ bps_tree_create_leaf(struct bps_tree *tree, bps_tree_block_id_t *id)
>  			       bps_tree_garbage_pop(tree, id);
>  	if (!res)
>  		res = (struct bps_leaf *)matras_alloc(&tree->matras, id);
> +	if (!res)
> +		return NULL;

In case res was not NULL (what is 99.(9)% of all cases), you
will double check it. Please, move the second check into first
'if's body after matras_alloc.