From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtpng3.m.smailru.net (smtpng3.m.smailru.net [94.100.177.149]) (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 C290045C304 for ; Mon, 14 Dec 2020 18:35:47 +0300 (MSK) From: Sergey Nikiforov Date: Mon, 14 Dec 2020 18:35:27 +0300 Message-Id: <20201214153527.451373-1-void@tarantool.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [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: tarantool-patches@dev.tarantool.org Cc: Vladislav Shpilevoy Added corresponding test Fixes: #5307 --- src/box/lua/key_def.c | 9 +++++++ .../gh-5307-key_def-part-count-check.result | 1 + .../gh-5307-key_def-part-count-check.test.lua | 25 +++++++++++++++++++ 3 files changed, 35 insertions(+) create mode 100644 test/app-tap/gh-5307-key_def-part-count-check.result create mode 100755 test/app-tap/gh-5307-key_def-part-count-check.test.lua 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); + } + if (key_validate_parts(key_def, key, part_count, true, &key_end) != 0) { region_truncate(region, region_svp); diff --git a/test/app-tap/gh-5307-key_def-part-count-check.result b/test/app-tap/gh-5307-key_def-part-count-check.result new file mode 100644 index 000000000..d47a905a5 --- /dev/null +++ b/test/app-tap/gh-5307-key_def-part-count-check.result @@ -0,0 +1 @@ +Failed (as it should), error message: Invalid key part count (expected [0..1], got 9) diff --git a/test/app-tap/gh-5307-key_def-part-count-check.test.lua b/test/app-tap/gh-5307-key_def-part-count-check.test.lua new file mode 100755 index 000000000..8c8f6f34b --- /dev/null +++ b/test/app-tap/gh-5307-key_def-part-count-check.test.lua @@ -0,0 +1,25 @@ +#!/usr/bin/env tarantool + +key_def = require('key_def') +kd = key_def.new({{fieldno = 1, type = 'unsigned'}}) + +-- Should succeed +if (kd:compare_with_key({1}, {1}) ~= 0) then + print("Error: should be equal") +end + +-- Should succeed +if (kd:compare_with_key({1}, {2}) >= 0) then + print("Error: should be less") +end + +-- Should fail +ok, err = pcall(function() + kd:compare_with_key({1}, {1, 2, 3, 4, 5, 6, 7, 8, 9}) + end) +if (ok) then + print("Error: it should not have succeeded") +else + print("Failed (as it should), error message: " .. err) +end + -- 2.25.1