From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp17.mail.ru (smtp17.mail.ru [94.100.176.154]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 3CC9645C304 for ; Thu, 17 Dec 2020 14:28:40 +0300 (MSK) Date: Thu, 17 Dec 2020 14:28:48 +0300 From: Alexander Turenko Message-ID: <20201217112848.6uyp4352tzx6vpix@tkn_work_nb> References: <20201214153527.451373-1-void@tarantool.org> <06ed17cb-9758-33fc-25da-61db02d1f60b@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <06ed17cb-9758-33fc-25da-61db02d1f60b@tarantool.org> Subject: Re: [Tarantool-patches] [PATCH] lua/key_def: fix compare_with_key() part count check List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Vladislav Shpilevoy Cc: tarantool-patches@dev.tarantool.org > > diff --git a/src/box/lua/key_def.c b/src/box/lua/key_def.c > > index a781aeff9..674891a85 100644 > > --- a/src/box/lua/key_def.c > > +++ b/src/box/lua/key_def.c > > @@ -362,6 +362,15 @@ lbox_key_def_compare_with_key(struct lua_State *L) > > size_t key_len; > > const char *key_end, *key = lbox_encode_tuple_on_gc(L, 3, &key_len); > > uint32_t part_count = mp_decode_array(&key); > > + > > + if (part_count > key_def->part_count) { > > + region_truncate(region, region_svp); > > + tuple_unref(tuple); > > + diag_set(ClientError, ER_KEY_PART_COUNT, > > + key_def->part_count, part_count); > > + return luaT_error(L); > > + } > > Why this check and the call below can't be all simply > replaces with box_key_def_validate_key() call? I agree. I introduced this function to use in the corresponding place of the tuple-keydef code: https://github.com/tarantool/tuple-keydef/blob/10c00a9aa289bb16446239edfa056ee48b467161/tuple/keydef.c#L517 > > > + > > if (key_validate_parts(key_def, key, part_count, true, > > &key_end) != 0) { > > region_truncate(region, region_svp);