From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
To: Ilya Kosarev <i.kosarev@tarantool.org>,
tarantool-patches@dev.tarantool.org
Subject: Re: [Tarantool-patches] [PATCH v3 1/2] b-tree: return NULL on matras_alloc fail
Date: Tue, 21 Jan 2020 21:55:36 +0100 [thread overview]
Message-ID: <fe51f9f6-457d-1f1f-8275-ddb251450627@tarantool.org> (raw)
In-Reply-To: <591f17842bd4138b5598d6d69822195daef63375.1579541242.git.i.kosarev@tarantool.org>
Hi! Thanks for the patch!
I agree with Nikita in everything, especially
about bps_tree_create_inner().
Sorry, when I said that code style should be
fixed I didn't take into account that bps_tree
is like a separate library with own code style
where ! is used instead of == NULL.
On 20/01/2020 19:13, 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.
>
> 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..a10f0a32c 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 == NULL) {
> + res = (struct bps_leaf *) matras_alloc(&tree->matras, id);
> + if (res == NULL)
> + return NULL;
> + }
> res->header.type = BPS_TREE_BT_LEAF;
> tree->leaf_count++;
> return res;
>
next prev parent reply other threads:[~2020-01-21 20:55 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-20 18:13 [Tarantool-patches] [PATCH v3 0/2] Safe truncation and deletion Ilya Kosarev
2020-01-20 18:13 ` [Tarantool-patches] [PATCH v3 1/2] b-tree: return NULL on matras_alloc fail Ilya Kosarev
2020-01-21 10:32 ` Nikita Pettik
2020-01-31 8:18 ` Konstantin Osipov
2020-02-04 17:13 ` Nikita Pettik
2020-02-04 17:25 ` Konstantin Osipov
2020-02-04 18:08 ` Nikita Pettik
2020-02-04 18:25 ` Konstantin Osipov
2020-01-21 20:55 ` Vladislav Shpilevoy [this message]
2020-01-20 18:13 ` [Tarantool-patches] [PATCH v3 2/2] memtx: allow quota overuse for truncation and deletion Ilya Kosarev
2020-01-21 11:42 ` Nikita Pettik
2020-01-21 20:59 ` Vladislav Shpilevoy
2020-02-14 19:57 ` Ilya Kosarev
2020-01-31 8:21 ` Konstantin Osipov
2020-02-04 18:56 ` Ilya Kosarev
2020-02-04 20:06 ` Konstantin Osipov
2020-02-05 19:11 ` Ilya Kosarev
2020-02-05 19:17 ` Konstantin Osipov
2020-02-06 10:50 ` Ilya Kosarev
2020-02-06 14:29 ` Konstantin Osipov
2020-02-06 16:14 ` Ilya Kosarev
2020-02-06 16:26 ` Konstantin Osipov
2020-02-10 8:24 ` Ilya Kosarev
2020-02-10 9:49 ` Konstantin Osipov
2020-02-10 10:43 ` Ilya Kosarev
2020-02-10 10:50 ` Konstantin Osipov
2020-02-14 19:55 ` Ilya Kosarev
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=fe51f9f6-457d-1f1f-8275-ddb251450627@tarantool.org \
--to=v.shpilevoy@tarantool.org \
--cc=i.kosarev@tarantool.org \
--cc=tarantool-patches@dev.tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH v3 1/2] 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