From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <i.kosarev@tarantool.org>
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 dev.tarantool.org (Postfix) with ESMTPS id 8155546970E
for <tarantool-patches@dev.tarantool.org>;
Tue, 14 Jan 2020 00:31:27 +0300 (MSK)
From: Ilya Kosarev <i.kosarev@tarantool.org>
Date: Tue, 14 Jan 2020 00:31:22 +0300
Message-Id: <5697dc45201ed20fbed9d970316bae83244fa22f.1578951026.git.i.kosarev@tarantool.org>
In-Reply-To: <cover.1578951026.git.i.kosarev@tarantool.org>
References: <cover.1578951026.git.i.kosarev@tarantool.org>
In-Reply-To: <cover.1578951026.git.i.kosarev@tarantool.org>
References: <cover.1578951026.git.i.kosarev@tarantool.org>
Subject: [Tarantool-patches] [PATCH v2 1/2] 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: tarantool-patches@dev.tarantool.org
Cc: v.shpilevoy@tarantool.org
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.
Part of: #3807
---
src/lib/salad/bps_tree.h | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/lib/salad/bps_tree.h b/src/lib/salad/bps_tree.h
index d28b53f53..ede2a3b7f 100644
--- a/src/lib/salad/bps_tree.h
+++ b/src/lib/salad/bps_tree.h
@@ -2147,8 +2147,11 @@ bps_tree_create_leaf(struct bps_tree *tree, bps_tree_block_id_t *id)
{
struct bps_leaf *res = (struct bps_leaf *)
bps_tree_garbage_pop(tree, id);
- if (!res)
- res = (struct bps_leaf *)matras_alloc(&tree->matras, id);
+ if (!res) {
+ res = (struct bps_leaf *) matras_alloc(&tree->matras, id);
+ if (!res)
+ return NULL;
+ }
res->header.type = BPS_TREE_BT_LEAF;
tree->leaf_count++;
return res;
--
2.17.1