From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp50.i.mail.ru (smtp50.i.mail.ru [94.100.177.110]) (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 4A06F46971A for ; Fri, 13 Dec 2019 10:05:20 +0300 (MSK) From: Ilya Kosarev Date: Fri, 13 Dec 2019 10:05:09 +0300 Message-Id: In-Reply-To: References: In-Reply-To: References: Subject: [Tarantool-patches] [PATCH 1/3] b-tree: return NULL on matras_alloc fail List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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. 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; res->header.type = BPS_TREE_BT_LEAF; tree->leaf_count++; return res; -- 2.17.1