From: Ilya Kosarev <i.kosarev@tarantool.org> To: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH 2/4] b-tree: return NULL on matras_alloc fail Date: Fri, 14 Feb 2020 22:40:32 +0300 [thread overview] Message-ID: <f66be70cdbb5a7920f5b14ee1d24cc3fecd77990.1581705010.git.i.kosarev@tarantool.org> (raw) In-Reply-To: <cover.1581705010.git.i.kosarev@tarantool.org> In-Reply-To: <cover.1581705010.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. Part of #3807 --- src/lib/salad/bps_tree.h | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/src/lib/salad/bps_tree.h b/src/lib/salad/bps_tree.h index d28b53f53..d71340143 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; @@ -2162,8 +2165,11 @@ bps_tree_create_inner(struct bps_tree *tree, bps_tree_block_id_t *id) { struct bps_inner *res = (struct bps_inner *) bps_tree_garbage_pop(tree, id); - if (!res) - res = (struct bps_inner *)matras_alloc(&tree->matras, id); + if (!res) { + res = (struct bps_inner *) matras_alloc(&tree->matras, id); + if (!res) + return NULL; + } res->header.type = BPS_TREE_BT_INNER; tree->inner_count++; return res; @@ -3472,6 +3478,8 @@ bps_tree_process_insert_leaf(struct bps_tree *tree, } bps_tree_block_id_t new_block_id = (bps_tree_block_id_t)(-1); struct bps_leaf *new_leaf = bps_tree_create_leaf(tree, &new_block_id); + if (!new_leaf) + return -1; leaf_path_elem->block = (struct bps_leaf *) bps_tree_touch_block(tree, leaf_path_elem->block_id); @@ -3710,6 +3718,8 @@ bps_tree_process_insert_leaf(struct bps_tree *tree, bps_tree_block_id_t new_root_id = (bps_tree_block_id_t)(-1); struct bps_inner *new_root = bps_tree_create_inner(tree, &new_root_id); + if (!new_root) + return -1; new_root->header.size = 2; new_root->child_ids[0] = tree->root_id; new_root->child_ids[1] = new_block_id; @@ -3835,6 +3845,8 @@ bps_tree_process_insert_inner(struct bps_tree *tree, bps_tree_block_id_t new_block_id = (bps_tree_block_id_t)(-1); struct bps_inner *new_inner = bps_tree_create_inner(tree, &new_block_id); + if (!new_inner) + return -1; new_inner->header.size = 0; struct bps_inner_path_elem new_path_elem; @@ -4030,6 +4042,8 @@ bps_tree_process_insert_inner(struct bps_tree *tree, bps_tree_block_id_t new_root_id = (bps_tree_block_id_t)(-1); struct bps_inner *new_root = bps_tree_create_inner(tree, &new_root_id); + if (!new_root) + return -1; new_root->header.size = 2; new_root->child_ids[0] = tree->root_id; new_root->child_ids[1] = new_block_id; -- 2.17.1
next prev parent reply other threads:[~2020-02-14 19:40 UTC|newest] Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-02-14 19:40 [Tarantool-patches] [PATCH 0/4] Safe truncation and deletion Ilya Kosarev 2020-02-14 19:40 ` [Tarantool-patches] [PATCH 1/4] small: bump small version Ilya Kosarev 2020-02-14 19:40 ` Ilya Kosarev [this message] 2020-02-14 19:40 ` [Tarantool-patches] [PATCH 3/4] memtx: use reserved slab for truncation Ilya Kosarev 2020-02-14 19:40 ` [Tarantool-patches] [PATCH 4/4] memtx: space:delete() might fail on reserve Ilya Kosarev 2020-02-14 22:48 ` [Tarantool-patches] [PATCH 0/4] Safe truncation and deletion Vladislav Shpilevoy 2020-02-15 15:33 ` Vladislav Shpilevoy 2020-02-15 16:34 ` Konstantin Osipov 2020-02-16 15:41 ` 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=f66be70cdbb5a7920f5b14ee1d24cc3fecd77990.1581705010.git.i.kosarev@tarantool.org \ --to=i.kosarev@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 2/4] 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