Tarantool development patches archive
 help / color / mirror / Atom feed
From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
To: Aleksandr Lyapunov <alyapunov@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: Wed, 12 Aug 2020 22:34:35 +0200	[thread overview]
Message-ID: <8b323479-64fd-f6d1-d7ec-69de463e0988@tarantool.org> (raw)
In-Reply-To: <184a98de-9f49-be82-39a5-84b3c7510697@tarantool.org>

>> +        if (offset_slot_hint != NULL) {
>>               *offset_slot_hint = offset_slot;
>> +            /*
>> +             * Hint is never requested for a multikey field without
>> +             * providing a concrete multikey index.
>> +             */
>> +            assert(!field->is_multikey_part ||
>> +                   (multikey_idx != MULTIKEY_NONE &&
>> +                field->is_multikey_part));
> The last '&& field->is_multikey_part' is excess.

Indeed, a stupid mistake. Somewhy I was sure it was needed yesterday.
Dropped now.

====================
 			assert(!field->is_multikey_part ||
-			       (multikey_idx != MULTIKEY_NONE &&
-				field->is_multikey_part));
+			       multikey_idx != MULTIKEY_NONE);
====================

  reply	other threads:[~2020-08-12 20:34 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
2020-08-11 21:24     ` Vladislav Shpilevoy
2020-08-12 13:05       ` Aleksandr Lyapunov
2020-08-12 20:34         ` Vladislav Shpilevoy [this message]
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=8b323479-64fd-f6d1-d7ec-69de463e0988@tarantool.org \
    --to=v.shpilevoy@tarantool.org \
    --cc=alyapunov@tarantool.org \
    --cc=korablev@tarantool.org \
    --cc=tarantool-patches@dev.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