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 018F16EC5E; Mon, 30 Aug 2021 09:20:39 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 018F16EC5E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1630304439; bh=gBqgivBeKwirZdESVYcqMLHA5qmyFlC3AyhhRhm4OUw=; h=To:Cc:Date:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=m/l+vlOF4FyqvvzO9gDaOSY++QaEGAtpScbIbLtRpEWHY1A0qfrrYdASU72zchXs8 eyLhY3YDrwenoilTO6t+ZHqtZFlEkVXX5f3rpl/IW22ktsE/8WfBlvVlxJNJK35h7i ZIoPhCFursIMdtpUX2uhBGNdk/gGwI4N1bFDYJTM= Received: from smtpng2.i.mail.ru (smtpng2.i.mail.ru [94.100.179.3]) (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 7B96B6EC5C for ; Mon, 30 Aug 2021 09:20:37 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 7B96B6EC5C Received: by smtpng2.m.smailru.net with esmtpa (envelope-from ) id 1mKaeq-0001EQ-Qw; Mon, 30 Aug 2021 09:20:37 +0300 To: tsafin@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Mon, 30 Aug 2021 09:20:36 +0300 Message-Id: <3fddf927be4ef819b63e172f29af58ac352da640.1630304393.git.imeevma@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD92087353F0EC44DD9C4DAED859F16A63896D62C811FDE4A33182A05F5380850406FF3110825A89C45E7E21D0EF25E96DCE761DC0A01965851A74E375901266623 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE71107D7B19CDFFE90EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006379EF8ECDDDA8246E28638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8180FEE005C6FB0FA1EF1A01A292F4DC2117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCAA867293B0326636D2E47CDBA5A96583BD4B6F7A4D31EC0BC014FD901B82EE079FA2833FD35BB23D27C277FBC8AE2E8BF1175FABE1C0F9B6A471835C12D1D977C4224003CC8364762BB6847A3DEAEFB0F43C7A68FF6260569E8FC8737B5C2249EC8D19AE6D49635B68655334FD4449CB9ECD01F8117BC8BEAAAE862A0553A39223F8577A6DFFEA7CB1724D34C644744043847C11F186F3C59DAA53EE0834AAEE X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C4DDEBE0CC47FE2695B05A56298475404913ADBF7A099DCF29C2B6934AE262D3EE7EAB7254005DCEDFB29427B7C22B3881E0A4E2319210D9B64D260DF9561598F01A9E91200F654B06CE7B4E551862B828E8E86DC7131B365E7726E8460B7C23C X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34EE6683D9E546CC62857708F1E31389826659D588779CCFC2CFA76B1DB22F527EBF20CE26C6704FEF1D7E09C32AA3244C1FFBF2FAA83B86CA3ADABF406D707474E8FBBEFAE1C4874C729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2bioj4DnN7V8kJ6ulj/9ncgvhbw== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5D04FE14622675ACC62127CB2FD01F41C583D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v1 1/1] sql: fix a segfault in hex() on receiving zeroblob 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 a segmentation fault when zeroblob is received by the SQL built-in HEX() function. Closes #6113 --- https://github.com/tarantool/tarantool/issues/6113 https://github.com/tarantool/tarantool/tree/imeevma/gh-6113-fix-hex-segfault-2.8 .../unreleased/gh-6113-fix-segfault-in-hex-func.md | 5 +++++ src/box/sql/func.c | 10 ++++++++-- test/sql-tap/engine.cfg | 1 + .../gh-6113-assert-in-hex-on-zeroblob.test.lua | 13 +++++++++++++ 4 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 changelogs/unreleased/gh-6113-fix-segfault-in-hex-func.md create mode 100755 test/sql-tap/gh-6113-assert-in-hex-on-zeroblob.test.lua diff --git a/changelogs/unreleased/gh-6113-fix-segfault-in-hex-func.md b/changelogs/unreleased/gh-6113-fix-segfault-in-hex-func.md new file mode 100644 index 000000000..c59be4d96 --- /dev/null +++ b/changelogs/unreleased/gh-6113-fix-segfault-in-hex-func.md @@ -0,0 +1,5 @@ +## bugfix/sql + +* The HEX() SQL built-in function now does not throw an assert on receiving + varbinary values that consist of zero-bytes (gh-6113). + diff --git a/src/box/sql/func.c b/src/box/sql/func.c index b137c6125..3ef31705e 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -1221,15 +1221,21 @@ hexFunc(sql_context * context, int argc, sql_value ** argv) UNUSED_PARAMETER(argc); pBlob = mem_as_bin(argv[0]); n = mem_len_unsafe(argv[0]); + assert((argv[0]->flags & MEM_Zero) == 0 || + argv[0]->type == MEM_TYPE_BIN); + int zero_len = (argv[0]->flags & MEM_Zero) == 0 ? 0 : argv[0]->u.nZero; assert(pBlob == mem_as_bin(argv[0])); /* No encoding change */ z = zHex = contextMalloc(context, ((i64) n) * 2 + 1); if (zHex) { - for (i = 0; i < n; i++, pBlob++) { + for (i = 0; i < n - zero_len; i++, pBlob++) { unsigned char c = *pBlob; *(z++) = hexdigits[(c >> 4) & 0xf]; *(z++) = hexdigits[c & 0xf]; } - *z = 0; + assert(i == n || (argv[0]->flags & MEM_Zero) != 0); + assert(n == zero_len + i); + memset(z, '0', 2 * zero_len); + z[2 * zero_len] = '\0'; sql_result_text(context, zHex, n * 2, sql_free); } } diff --git a/test/sql-tap/engine.cfg b/test/sql-tap/engine.cfg index 693a477b7..ddee8c328 100644 --- a/test/sql-tap/engine.cfg +++ b/test/sql-tap/engine.cfg @@ -21,6 +21,7 @@ "memtx": {"engine": "memtx"} }, "gh-4077-iproto-execute-no-bind.test.lua": {}, + "gh-6113-assert-in-hex-on-zeroblob.test.lua": {}, "*": { "memtx": {"engine": "memtx"}, "vinyl": {"engine": "vinyl"} diff --git a/test/sql-tap/gh-6113-assert-in-hex-on-zeroblob.test.lua b/test/sql-tap/gh-6113-assert-in-hex-on-zeroblob.test.lua new file mode 100755 index 000000000..91a29a5b4 --- /dev/null +++ b/test/sql-tap/gh-6113-assert-in-hex-on-zeroblob.test.lua @@ -0,0 +1,13 @@ +#!/usr/bin/env tarantool +local test = require("sqltester") +test:plan(1) + +test:do_execsql_test( + "gh-6113", + [[ + SELECT hex(zeroblob(0)), hex(zeroblob(10)); + ]], { + '', '00000000000000000000' + }) + +test:finish_test() -- 2.25.1