From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id BE31A6ECE3; Thu, 13 Jan 2022 12:37:20 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org BE31A6ECE3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1642066640; bh=/EG5y7deyvaPPYIDLb+mQ4G32GoC2WEoI/3tCgCSQX4=; h=To:Cc:Date:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=hAxu/wftsRriqJ4hBxbQq2SPuVgDh3VrepUSLBkU6MeQfqBAW6YLMT2DVEU/8rup2 oVQpURgfLtEjzKmiQlolPgFrPGXG/q6fZ9E5neq+aYiLQ9dqtvvSc44C3WwOxsx+tK bMIZaROBccZB+H7RDI/p22lCDpPATLlUGgPD4F44= Received: from smtpng1.i.mail.ru (smtpng1.i.mail.ru [94.100.181.251]) (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 3DF2E6ECE3 for ; Thu, 13 Jan 2022 12:37:19 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 3DF2E6ECE3 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1n7wXm-0003X7-HP; Thu, 13 Jan 2022 12:37:18 +0300 To: v.shpilevoy@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Thu, 13 Jan 2022 12:37:18 +0300 Message-Id: <0985d5f43f0eb85d5a2fdcff90f0b2a21a2ecfe8.1642066322.git.imeevma@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD99D69EC10612BAE372CD9A7EF9497EB40CB60B89F502C65C7182A05F5380850405C16ED7967428FF1902C162FD22C6B926DB8D9096E4975ECB972620FD9300A4A X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7C27E92EFAD44F80DEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006379E389E29EFC3C6B78638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8C8F972922EA7BA2AAFC1356A525DCE92117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCF1175FABE1C0F9B6A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18C26CFBAC0749D213D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B63D4080343FFB34AA089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C1429E440B35213BC1D20A03C09740615C5AAD024C7D879BC9C2B6934AE262D3EE7EAB7254005DCEDD39702B95798B1671E0A4E2319210D9B64D260DF9561598F01A9E91200F654B01098AAFFB0A1231D8E8E86DC7131B365E7726E8460B7C23C X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3455049D7B43D89D643DB36F694FCFA7303394D1D0B0F4CEFF86CB4FC828BA8127A6B26B9247753A381D7E09C32AA3244CA3CD621E8F101BE09F75332C406E029951E887DA02A9F7BF729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojbL9S8ysBdXgGc9iXmQbKidRXEJ9KhU56 X-Mailru-Sender: 689FA8AB762F739339CABD9B3CA9A7D6B17E885B5214E86CA8B01DF531C1F32583D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E3365FEEDEB644C299C0ED14614B50AE0675 X-Mras: Ok Subject: [Tarantool-patches] [PATCH v1 1/1] sql: fix assert when MP_EXT received via netbox X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Mergen Imeev via Tarantool-patches Reply-To: imeevma@tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" This patch fixes an assertion or segmentation fault when getting the value of MP_EXT via netbox. Closes #6766 --- https://github.com/tarantool/tarantool/issues/6766 https://github.com/tarantool/tarantool/tree/imeevma/gh-6766-fix-assert-when-decoding-mp-ext src/box/bind.c | 30 ++++++++++++++++++- test/sql-tap/engine.cfg | 1 + .../gh-6766-fix-bind-for-mp-ext.test.lua | 30 +++++++++++++++++++ 3 files changed, 60 insertions(+), 1 deletion(-) create mode 100755 test/sql-tap/gh-6766-fix-bind-for-mp-ext.test.lua diff --git a/src/box/bind.c b/src/box/bind.c index 441c9f46f..6672d1271 100644 --- a/src/box/bind.c +++ b/src/box/bind.c @@ -34,6 +34,8 @@ #include "sql/sqlInt.h" #include "sql/sqlLimit.h" #include "sql/vdbe.h" +#include "mp_decimal.h" +#include "mp_uuid.h" const char * sql_bind_name(const struct sql_bind *bind) @@ -99,9 +101,35 @@ sql_bind_decode(struct sql_bind *bind, int i, const char **packet) case MP_BIN: bind->s = mp_decode_bin(packet, &bind->bytes); break; + case MP_EXT: { + int8_t ext_type; + const char *svp = *packet; + uint32_t size = mp_decode_extl(packet, &ext_type); + if (ext_type != MP_UUID && ext_type != MP_DECIMAL) { + bind->s = svp; + *packet += size; + bind->bytes = *packet - svp; + break; + } + *packet = svp; + if (ext_type == MP_UUID) { + if (mp_decode_uuid(packet, &bind->uuid) == NULL) { + diag_set(ClientError, ER_INVALID_MSGPACK, + "Invalid MP_UUID MsgPack format"); + return -1; + } + } else { + if (mp_decode_decimal(packet, &bind->dec) == NULL) { + diag_set(ClientError, ER_INVALID_MSGPACK, + "Invalid MP_DECIMAL MsgPack format"); + return -1; + } + } + bind->ext_type = ext_type; + break; + } case MP_ARRAY: case MP_MAP: - case MP_EXT: bind->s = *packet; mp_next(packet); bind->bytes = *packet - bind->s; diff --git a/test/sql-tap/engine.cfg b/test/sql-tap/engine.cfg index 528212ab6..3bd416dd5 100644 --- a/test/sql-tap/engine.cfg +++ b/test/sql-tap/engine.cfg @@ -41,6 +41,7 @@ "gh-6375-assert-on-unsupported-ext.test.lua": {}, "gh-6485-bugs-in-decimal.test.lua": {}, "gh-6113-assert-in-hex-on-zeroblob.test.lua": {}, + "gh-6766-fix-bind-for-mp-ext.test.lua": {}, "*": { "memtx": {"engine": "memtx"}, "vinyl": {"engine": "vinyl"} diff --git a/test/sql-tap/gh-6766-fix-bind-for-mp-ext.test.lua b/test/sql-tap/gh-6766-fix-bind-for-mp-ext.test.lua new file mode 100755 index 000000000..8190917fd --- /dev/null +++ b/test/sql-tap/gh-6766-fix-bind-for-mp-ext.test.lua @@ -0,0 +1,30 @@ +#!/usr/bin/env tarantool +local test = require("sqltester") +test:plan(2) + +box.cfg{listen = os.getenv('LISTEN')} +local cn = require('net.box').connect(box.cfg.listen) + +test:do_test( + "gh-6766-1", + function() + local val = {require('decimal').new(1.5)} + local res = cn:execute([[SELECT typeof(?);]], val) + return {res.rows[1][1]} + end, { + 'decimal' + }) + +test:do_test( + "gh-6766-2", + function() + local val = {require('uuid').new()} + local res = cn:execute([[SELECT typeof(?);]], val) + return {res.rows[1][1]} + end, { + 'uuid' + }) + +cn:close() + +test:finish_test() -- 2.25.1