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 6F5946EC55; Thu, 26 Aug 2021 14:10:21 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 6F5946EC55 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1629976221; bh=6cC2uh8uNCoVU7ztATztLgKLmtmUlySiMDboOWSpCe4=; h=To:Cc:Date:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=pQw52HZ3eR3uEY2/TN7tdsPn8c8K9FeOrQh+7iLy2/pv4SubgDZcRsXjq8Dy8F4dG Hvq+uKJ7W9ip50YsuJgAOeMlRfGYBHgeUVDgSrDohhV8DNq8HOkl88DBFI4Q56ZbIh asTs0hl6qnUnpayPd6SX9j5PtCcb9iu/RP+39+/g= 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 5993D6EC55 for ; Thu, 26 Aug 2021 14:10:20 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 5993D6EC55 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1mJDH1-0003dD-PH; Thu, 26 Aug 2021 14:10:20 +0300 To: v.shpilevoy@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Thu, 26 Aug 2021 14:10:19 +0300 Message-Id: <866533cf6634609e69fdf734fd2a124361117a5f.1629976189.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: 4F1203BC0FB41BD92087353F0EC44DD91BCCB18F2C129F87F36E61E9E4584E9D182A05F538085040D2C5390E742B3AC3F456F3789B5C45775CDE27C393B31D67EB25BD86D1E90FDE X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE70EEC24FFE855BCBBC2099A533E45F2D0395957E7521B51C2CFCAF695D4D8E9FCEA1F7E6F0F101C6778DA827A17800CE722087ABFAC96EBFEEA1F7E6F0F101C6723150C8DA25C47586E58E00D9D99D84E1BDDB23E98D2D38BBCA57AF85F7723F269F8B749647D3277046BF3D75E017A89CC7F00164DA146DAFE8445B8C89999728AA50765F7900637F6B57BC7E64490618DEB871D839B7333395957E7521B51C2DFABB839C843B9C08941B15DA834481F8AA50765F7900637F6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA7E827F84554CEF5019E625A9149C048EE9ECD01F8117BC8BEE2021AF6380DFAD18AA50765F790063735872C767BF85DA227C277FBC8AE2E8BDAE3FA6833AEA0C275ECD9A6C639B01B4E70A05D1297E1BBCB5012B2E24CD356 X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975CD38A7E49931D2E15C63BFCEDA7E8246AFCB6227DB5FB47ED9C2B6934AE262D3EE7EAB7254005DCEDFB29427B7C22B3881E0A4E2319210D9B64D260DF9561598F01A9E91200F654B0BDBC62CB1440F3B18E8E86DC7131B365E7726E8460B7C23C X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3473688ED311681BF065860472DCDC410FF1392D632615A3D0AE894647AC4BFE6F8980A968778BBA1B1D7E09C32AA3244C0741BF085D8C3164BDD3E1F43433B4193A92A9747B6CC886729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojXSF/Tsl6M2O504g1XPRA8Q== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5D058684CCF9740EBAC8777B854AD5E58D83D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B 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, 28 insertions(+), 1 deletion(-) 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..d182bb313 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -1221,14 +1221,22 @@ 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]; } + for (; i < n; ++i) { + assert((argv[0]->flags & MEM_Zero) != 0); + *(z++) = '0'; + *(z++) = '0'; + } *z = 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