From: Ilya Kosarev <i.kosarev@tarantool.org>
To: tarantool-patches@dev.tarantool.org
Cc: v.shpilevoy@tarantool.org
Subject: [Tarantool-patches] [PATCH 1/3] b-tree: return NULL on matras_alloc fail
Date: Fri, 13 Dec 2019 10:05:09 +0300 [thread overview]
Message-ID: <efaf12866c7a49ccef04843026b3d82d8aaf01d6.1575627361.git.i.kosarev@tarantool.org> (raw)
In-Reply-To: <cover.1575627361.git.i.kosarev@tarantool.org>
In-Reply-To: <cover.1575627361.git.i.kosarev@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
next prev parent reply other threads:[~2019-12-13 7:05 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-13 7:05 [Tarantool-patches] [PATCH 0/3] Safe allocation on truncation and deletion Ilya Kosarev
2019-12-13 7:05 ` Ilya Kosarev [this message]
2019-12-19 0:32 ` [Tarantool-patches] [PATCH 1/3] b-tree: return NULL on matras_alloc fail Vladislav Shpilevoy
2019-12-13 7:05 ` [Tarantool-patches] [PATCH 2/3] memtx: don't reserve extra memory if not needed Ilya Kosarev
2019-12-19 0:31 ` Vladislav Shpilevoy
2019-12-13 7:05 ` [Tarantool-patches] [PATCH 3/3] tuple: use calloc for service truncation tuples Ilya Kosarev
2019-12-19 0:31 ` Vladislav Shpilevoy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=efaf12866c7a49ccef04843026b3d82d8aaf01d6.1575627361.git.i.kosarev@tarantool.org \
--to=i.kosarev@tarantool.org \
--cc=tarantool-patches@dev.tarantool.org \
--cc=v.shpilevoy@tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH 1/3] b-tree: return NULL on matras_alloc fail' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox