From: Aleksandr Lyapunov <alyapunov@tarantool.org>
To: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>,
tarantool-patches@dev.tarantool.org, korablev@tarantool.org
Subject: Re: [Tarantool-patches] [PATCH 1/2] tuple: fix multikey field JSON access crash
Date: Tue, 11 Aug 2020 12:44:01 +0300 [thread overview]
Message-ID: <53095890-c0b6-6eae-b3b1-9898e7ca05e3@tarantool.org> (raw)
In-Reply-To: <f1b60f4011e19aa04c0ff7d49c82e46955a968fc.1596584571.git.v.shpilevoy@tarantool.org>
Hi! thanks again for the patch. see one comment below.
On 8/5/20 2:45 AM, Vladislav Shpilevoy wrote:
> goto parse;
> if (offset_slot_hint != NULL)
> *offset_slot_hint = offset_slot;
> + /*
> + * When the field is multikey, the offset slot points not at the
> + * data. It points at 'extra' array of offsets for this multikey
> + * index. That array can only be accessed if index in that array
> + * is known.
> + */
> + if (field->is_multikey_part && multikey_idx == MULTIKEY_NONE)
> + goto parse;
> offset_slot_access:
> /* Indexed field */
> offset = field_map_get_offset(field_map, offset_slot,
I'm sure that your check must be moved for two lines up. I mean the check
must be done before setting *offset_slot_hint.
As I understood offset_slot_hint will contain a hint for further
tuple_field_raw_by_path
calls with the same path. That is a kind of agreement, we may call
tuple_field_raw_by_path
twice and must get the same results.
But in your code you set *offset_slot_hint before a check that could go
to 'parse' label.
Meanwhile in the second call of tuple_field_raw_by_path it'll check
*offset_slot_hint and
will go to 'offset_slot_access' label. That's wrong.
next prev parent reply other threads:[~2020-08-11 9:44 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-04 23:45 [Tarantool-patches] [PATCH 0/2] JSON field multikey crash Vladislav Shpilevoy
2020-08-04 23:45 ` [Tarantool-patches] [PATCH 1/2] tuple: fix multikey field JSON access crash Vladislav Shpilevoy
2020-08-06 16:00 ` Oleg Babin
2020-08-06 20:04 ` Vladislav Shpilevoy
2020-08-10 16:09 ` Nikita Pettik
2020-08-11 9:44 ` Aleksandr Lyapunov [this message]
2020-08-11 21:24 ` Vladislav Shpilevoy
2020-08-12 13:05 ` Aleksandr Lyapunov
2020-08-12 20:34 ` Vladislav Shpilevoy
2020-08-04 23:45 ` [Tarantool-patches] [PATCH 2/2] tuple: fix access by JSON path starting from '[*]' Vladislav Shpilevoy
2020-08-10 17:52 ` Nikita Pettik
2020-08-11 18:50 ` Aleksandr Lyapunov
2020-08-10 10:10 ` [Tarantool-patches] [PATCH 0/2] JSON field multikey crash Aleksandr Lyapunov
2020-08-10 22:22 ` Vladislav Shpilevoy
2020-08-12 20:34 ` 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=53095890-c0b6-6eae-b3b1-9898e7ca05e3@tarantool.org \
--to=alyapunov@tarantool.org \
--cc=korablev@tarantool.org \
--cc=tarantool-patches@dev.tarantool.org \
--cc=v.shpilevoy@tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH 1/2] tuple: fix multikey field JSON access crash' \
/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