From: "Ilya Kosarev" <i.kosarev@tarantool.org>
To: "Vladislav Shpilevoy" <v.shpilevoy@tarantool.org>,
tarantool-patches <tarantool-patches@dev.tarantool.org>
Subject: [Tarantool-patches] Fwd: Re[2]: [PATCH 1/3] b-tree: return NULL on matras_alloc fail
Date: Fri, 10 Jan 2020 14:44:39 +0300 [thread overview]
Message-ID: <1578656679.347266049@f529.i.mail.ru> (raw)
[-- Attachment #1: Type: text/plain, Size: 1246 bytes --]
Hi!
Thanks for your review.
Right, fixed in v2.
>Четверг, 19 декабря 2019, 3:32 +03:00 от Vladislav Shpilevoy < v.shpilevoy@tarantool.org >:
>
>Hi! Thanks for the patch!
>
>On 13/12/2019 08:05, 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.
>>
>> 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;
>In case res was not NULL (what is 99.(9)% of all cases), you
>will double check it. Please, move the second check into first
>'if's body after matras_alloc.
--
Ilya Kosarev
----------------------------------------------------------------------
--
Ilya Kosarev
[-- Attachment #2: Type: text/html, Size: 2633 bytes --]
reply other threads:[~2020-01-10 11:44 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=1578656679.347266049@f529.i.mail.ru \
--to=i.kosarev@tarantool.org \
--cc=tarantool-patches@dev.tarantool.org \
--cc=v.shpilevoy@tarantool.org \
--subject='Re: [Tarantool-patches] Fwd: Re[2]: [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