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 1AD4A445328 for ; Thu, 16 Jul 2020 17:46:24 +0300 (MSK) From: imeevma@tarantool.org Date: Thu, 16 Jul 2020 17:46:23 +0300 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH v6 10/22] sql: check args of randomblob() List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: korablev@tarantool.org, tsafin@tarantool.org, tarantool-patches@dev.tarantool.org After this patch, the argument types of the randomblob() function will be checked properly. Part of #4159 --- src/box/sql/func.c | 12 ++++----- test/sql-tap/func.test.lua | 6 ++--- test/sql-tap/func5.test.lua | 51 ++++++++++++++++++++++++++++++++++++- 3 files changed, 58 insertions(+), 11 deletions(-) diff --git a/src/box/sql/func.c b/src/box/sql/func.c index a1b284762..ae9b6d138 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -937,12 +937,10 @@ randomBlob(sql_context * context, int argc, sql_value ** argv) unsigned char *p; assert(argc == 1); UNUSED_PARAMETER(argc); - if (mp_type_is_bloblike(sql_value_type(argv[0]))) { - diag_set(ClientError, ER_SQL_TYPE_MISMATCH, - sql_value_to_diag_str(argv[0]), "numeric"); - context->is_aborted = true; - return; - } + enum mp_type mp_type = sql_value_type(argv[0]); + if (mp_type == MP_NIL) + return sql_result_null(context); + assert(mp_type == MP_UINT); n = sql_value_int(argv[0]); if (n < 1) return; @@ -2734,7 +2732,7 @@ static struct { }, { .name = "RANDOMBLOB", .param_count = 1, - .first_arg = FIELD_TYPE_ANY, + .first_arg = FIELD_TYPE_UNSIGNED, .args = FIELD_TYPE_ANY, .is_blob_like_str = false, .returns = FIELD_TYPE_VARBINARY, diff --git a/test/sql-tap/func.test.lua b/test/sql-tap/func.test.lua index db267d0f5..2ae36fe64 100755 --- a/test/sql-tap/func.test.lua +++ b/test/sql-tap/func.test.lua @@ -982,14 +982,14 @@ test:do_execsql_test( -- }) -test:do_execsql_test( +test:do_catchsql_test( "func-9.5", [[ SELECT length(randomblob(32)), length(randomblob(-5)), length(randomblob(2000)) ]], { -- - 32, "", 2000 + 1, "Type mismatch: can not convert -5 to unsigned" -- }) @@ -2928,7 +2928,7 @@ test:do_catchsql_test( SELECT RANDOMBLOB(X'FF') ]], { -- - 1, "Type mismatch: can not convert varbinary to numeric" + 1, "Type mismatch: can not convert varbinary to unsigned" -- }) diff --git a/test/sql-tap/func5.test.lua b/test/sql-tap/func5.test.lua index 170dee9f9..30653e9e1 100755 --- a/test/sql-tap/func5.test.lua +++ b/test/sql-tap/func5.test.lua @@ -1,6 +1,6 @@ #!/usr/bin/env tarantool test = require("sqltester") -test:plan(106) +test:plan(113) --!./tcltestrunner.lua -- 2010 August 27 @@ -885,4 +885,53 @@ test:do_execsql_test( 2 }) +test:do_execsql_test( + "func-5-6.13.1", [[ + SELECT randomblob(NULL); + ]],{ + "" + }) + +test:do_execsql_test( + "func-5-6.13.2", [[ + SELECT typeof(randomblob(123)); + ]], { + "varbinary" + }) + +test:do_catchsql_test( + "func-5-6.13.3", [[ + SELECT randomblob(-123); + ]], { + 1, "Type mismatch: can not convert -123 to unsigned" + }) + +test:do_catchsql_test( + "func-5-6.13.4", [[ + SELECT randomblob(-5.5); + ]], { + 1, "Type mismatch: can not convert -5.5 to unsigned" + }) + +test:do_catchsql_test( + "func-5-6.13.5", [[ + SELECT randomblob('-123'); + ]], { + 1, "Type mismatch: can not convert -123 to unsigned" + }) + +test:do_catchsql_test( + "func-5-6.13.6", [[ + SELECT randomblob(false); + ]], { + 1, "Type mismatch: can not convert FALSE to unsigned" + }) + +test:do_catchsql_test( + "func-5-6.13.7", [[ + SELECT randomblob(X'3334'); + ]], { + 1, "Type mismatch: can not convert varbinary to unsigned" + }) + test:finish_test() -- 2.25.1