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 3A4376EC5A; Thu, 2 Sep 2021 12:35:58 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 3A4376EC5A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1630575358; bh=kcOEwuqnrwF/8GocK53dOzc0AHNI3CVe6HAEQo5PXtM=; h=Date:To:Cc:References:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=rZrJH5iLejL/uhBL4evoPj5PECs1EoVttOU34ICalkuulA6l7aCa0kTh71e1l8xpn Hk0v7bonIQVCVeJAsdp1GNIhT/VjkYtzh+MaX4Bb7GBBZ3spk5c3bvASi7NbgXaF8k C5ZanlRv4wtANLNgLEt2hEwwRWPrYJCFJa7qAlGM= 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 7D9346EC5A for ; Thu, 2 Sep 2021 12:35:56 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 7D9346EC5A Received: by smtpng2.m.smailru.net with esmtpa (envelope-from ) id 1mLj8V-0000If-K1; Thu, 02 Sep 2021 12:35:56 +0300 Date: Thu, 2 Sep 2021 12:35:54 +0300 To: Timur Safin Cc: tarantool-patches@dev.tarantool.org Message-ID: <20210902093554.GA52681@tarantool.org> References: <9beadd2600ef349c5bf5142716784526423b317c.1630572128.git.imeevma@gmail.com> <069e01d79fdb$1fac2ab0$5f048010$@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <069e01d79fdb$1fac2ab0$5f048010$@tarantool.org> X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9EE8D69D3379D80C415CE0F653C47E01F4DAEAB3FA4F14AD6182A05F538085040CD2679FC1F384CDA78B4651D37F3D6EDAEBF151F7F11B94A5099C8AE9120DF8C X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE766DBE83FD69AB645EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006370E0E628E5A2670BA8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8010B338555559CD8EBFE248A67389D5A117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC2EE5AD8F952D28FBA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18BDFBBEFFF4125B51D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B6300D3B61E77C8D3B089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: 0D63561A33F958A59445B21AC170A6E317367E04767D08F572C31ECF786FE681D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA752546FE575EB473F1410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34D75CEA0D7A80616EC53A58088DBB1ED9425FCBD7634528DE26B13E47487EFED08D1C17D65036FCC81D7E09C32AA3244CB2888A67D7291B43A043DCF5C3FE36A033C9DC155518937F729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojK/h3ZnmlPjG+ndwbv06PHw== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5D189A22B88847116949FB22DE7983AA8C83D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v1 1/1] sql: fix error on copy empty string in mem_copy() 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: Mergen Imeev Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Hi! Thank you for the review! My answer below. On Thu, Sep 02, 2021 at 12:15:50PM +0300, Timur Safin wrote: > You intentionally increase memory usage here (before we had a > chance to release memory for empty literals, nowadays you leave > 32-bytes hanging longer. And why 32, and not, say, 8 bytes - > which is lowest allocation granularity). I did this because we already have case when 32 bytes or more allocated. You can see this in sqlVdbeMemGrow(). > I don't like it in a longer-term, but as a short term dirty > work-around - that's ok. We will reshake I agree that this should be rethought, but I disagree that this is dirty work-around - it works according the rules of most cases, when allocated memory is used. This is so because in most cases we use sqlVdbeMemGrow(), which allocates no less than 32 bytes. > > LGTM > > Timur > > > > -----Original Message----- > > From: imeevma@tarantool.org > > Sent: Thursday, September 2, 2021 11:43 AM > > To: tsafin@tarantool.org > > Cc: tarantool-patches@dev.tarantool.org > > Subject: [PATCH v1 1/1] sql: fix error on copy empty string in > > mem_copy() > > > > This patch fixes the problem with copying an empty string in > > mem_copy(). > > Previously, because the string length was 0, an error was thrown, but > > the diag was not set, which could lead to an error due to an empty > > diag > > or to a double free. > > > > Closes #6157 > > Closes #6399 > > --- > > https://github.com/tarantool/tarantool/issues/6157 > > https://github.com/tarantool/tarantool/issues/6399 > > https://github.com/tarantool/tarantool/tree/imeevma/gh-6157-fix- > > error-on-empty-str > > > > .../gh-6157-fix-error-on-copy-empty-str.md | 4 ++++ > > src/box/sql/func.c | 6 ++++-- > > src/box/sql/mem.c | 3 ++- > > src/box/sql/vdbe.c | 3 ++- > > src/box/sql/vdbeapi.c | 3 ++- > > src/box/sql/vdbeaux.c | 8 +++++-- > > test/sql-tap/engine.cfg | 1 + > > ...h-6157-unnecessary-free-on-string.test.lua | 21 > > +++++++++++++++++++ > > 8 files changed, 42 insertions(+), 7 deletions(-) > > create mode 100644 changelogs/unreleased/gh-6157-fix-error-on-copy- > > empty-str.md > > create mode 100755 test/sql-tap/gh-6157-unnecessary-free-on- > > string.test.lua > > > > diff --git a/changelogs/unreleased/gh-6157-fix-error-on-copy-empty- > > str.md b/changelogs/unreleased/gh-6157-fix-error-on-copy-empty-str.md > > new file mode 100644 > > index 000000000..398b6e31d > > --- /dev/null > > +++ b/changelogs/unreleased/gh-6157-fix-error-on-copy-empty-str.md > > @@ -0,0 +1,4 @@ > > +## bugfix/sql > > + > > +* Now, when copying an empty string, an error will not be set > > + unnecessarily (gh-6157, gh-6399). > > diff --git a/src/box/sql/func.c b/src/box/sql/func.c > > index c063552d6..9009f9e4f 100644 > > --- a/src/box/sql/func.c > > +++ b/src/box/sql/func.c > > @@ -1771,13 +1771,15 @@ minmaxStep(sql_context * context, int > > NotUsed, sql_value ** argv) > > bool is_max = (func->flags & SQL_FUNC_MAX) != 0; > > int cmp = mem_cmp_scalar(pBest, pArg, pColl); > > if ((is_max && cmp < 0) || (!is_max && cmp > 0)) { > > - mem_copy(pBest, pArg); > > + if (mem_copy(pBest, pArg) != 0) > > + context->is_aborted = true; > > } else { > > sqlSkipAccumulatorLoad(context); > > } > > } else { > > pBest->db = sql_context_db_handle(context); > > - mem_copy(pBest, pArg); > > + if (mem_copy(pBest, pArg) != 0) > > + context->is_aborted = true; > > } > > } > > > > diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c > > index 24de26548..48755a017 100644 > > --- a/src/box/sql/mem.c > > +++ b/src/box/sql/mem.c > > @@ -1913,7 +1913,8 @@ mem_copy(struct Mem *to, const struct Mem > > *from) > > assert((to->flags & MEM_Zero) == 0 || to->type == MEM_TYPE_BIN); > > if ((to->flags & MEM_Zero) != 0) > > return sqlVdbeMemExpandBlob(to); > > - to->zMalloc = sqlDbReallocOrFree(to->db, to->zMalloc, to->n); > > + to->zMalloc = sqlDbRealloc(to->db, to->zMalloc, MAX(32, to->n)); > > + assert(to->zMalloc != NULL || sql_get()->mallocFailed != 0); > > if (to->zMalloc == NULL) > > return -1; > > to->szMalloc = sqlDbMallocSize(to->db, to->zMalloc); > > diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c > > index 7f86fa7b3..44533fb3e 100644 > > --- a/src/box/sql/vdbe.c > > +++ b/src/box/sql/vdbe.c > > @@ -978,7 +978,8 @@ case OP_Copy: { > > pOut = &aMem[pOp->p2]; > > assert(pOut!=pIn1); > > while( 1) { > > - mem_copy(pOut, pIn1); > > + if (mem_copy(pOut, pIn1) != 0) > > + goto abort_due_to_error; > > REGISTER_TRACE(p, pOp->p2+pOp->p3-n, pOut); > > if ((n--)==0) break; > > pOut++; > > diff --git a/src/box/sql/vdbeapi.c b/src/box/sql/vdbeapi.c > > index 77df0e4cc..115940227 100644 > > --- a/src/box/sql/vdbeapi.c > > +++ b/src/box/sql/vdbeapi.c > > @@ -232,7 +232,8 @@ sql_result_text64(sql_context * pCtx, > > void > > sql_result_value(sql_context * pCtx, sql_value * pValue) > > { > > - mem_copy(pCtx->pOut, pValue); > > + if (mem_copy(pCtx->pOut, pValue) != 0) > > + pCtx->is_aborted = true; > > } > > > > void > > diff --git a/src/box/sql/vdbeaux.c b/src/box/sql/vdbeaux.c > > index 2d7800b17..8148ed8b0 100644 > > --- a/src/box/sql/vdbeaux.c > > +++ b/src/box/sql/vdbeaux.c > > @@ -2318,8 +2318,12 @@ sqlVdbeGetBoundValue(struct Vdbe *v, int iVar) > > Mem *pMem = &v->aVar[iVar - 1]; > > if (!mem_is_null(pMem)) { > > sql_value *pRet = sqlValueNew(v->db); > > - if (pRet != NULL) > > - mem_copy(pRet, pMem); > > + if (pRet == NULL) > > + return NULL; > > + if (mem_copy(pRet, pMem) != 0) { > > + sqlValueFree(pRet); > > + return NULL; > > + } > > return pRet; > > } > > } > > diff --git a/test/sql-tap/engine.cfg b/test/sql-tap/engine.cfg > > index 587adbed9..c35d1dced 100644 > > --- a/test/sql-tap/engine.cfg > > +++ b/test/sql-tap/engine.cfg > > @@ -35,6 +35,7 @@ > > "built-in-functions.test.lua": { > > "memtx": {"engine": "memtx"} > > }, > > + "gh-6157-unnecessary-free-on-string.test.lua": {}, > > "gh-4077-iproto-execute-no-bind.test.lua": {}, > > "gh-6375-assert-on-unsupported-ext.test.lua": {}, > > "*": { > > diff --git a/test/sql-tap/gh-6157-unnecessary-free-on-string.test.lua > > b/test/sql-tap/gh-6157-unnecessary-free-on-string.test.lua > > new file mode 100755 > > index 000000000..ebe69906a > > --- /dev/null > > +++ b/test/sql-tap/gh-6157-unnecessary-free-on-string.test.lua > > @@ -0,0 +1,21 @@ > > +#!/usr/bin/env tarantool > > +local test = require("sqltester") > > +test:plan(1) > > + > > +-- > > +-- Make sure there is no assert due to an incorrectly set error in > > mem_copy(). > > +-- How this test works: We have 128 mempool cells in SQL > > ("lookaside"), and > > +-- until those 128 cells are filled in, the error cannot be > > reproduced. Also, we > > +-- have to get '' from somewhere because if we just enter it, it > > will be of type > > +-- STATIC and no memory will be allocated. > > +-- > > +local query = "NULLIF(SUBSTR('123', 1, 0), NULL)" > > +for _ = 1, 7 do query = query..', '..query end > > +query = "SELECT "..query..", NULLIF(SUBSTR('123', 1, 0), NULL);" > > +-- The "query" variable contains 129 expressions. > > +local result = {} > > +for _ = 1, 129 do table.insert(result, '') end > > + > > +test:do_execsql_test("gh-6157", query, result) > > + > > +test:finish_test() > > -- > > 2.25.1 > >