From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id B0645226B2 for ; Wed, 19 Dec 2018 10:37:30 -0500 (EST) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EGYJ6fyGHZsJ for ; Wed, 19 Dec 2018 10:37:30 -0500 (EST) Received: from smtp61.i.mail.ru (smtp61.i.mail.ru [217.69.128.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id 1253A22589 for ; Wed, 19 Dec 2018 10:37:29 -0500 (EST) From: Kirill Shcherbatov Subject: [tarantool-patches] [PATCH v1 2/3] sql: fix sql_vdbe_mem_alloc_region result memory Date: Wed, 19 Dec 2018 18:37:24 +0300 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-subscribe: List-owner: List-post: List-archive: To: tarantool-patches@freelists.org, v.shpilevoy@tarantool.org Cc: Kirill Shcherbatov The function sql_vdbe_mem_alloc_region that constructing the value of Vdbe Mem object used to change only flags responsible for it's type. It is also required to grind old flags, as their combination may be invalid. In a typical Vdbe scenario, OP_MakeRecord and OP_RowData make memory release with sqlite3VdbeMemRelease and allocation on region with sql_vdbe_mem_alloc_region call. An integrity assert based on sqlite3VdbeCheckMemInvariants would fire here because of contradictory combination of flags MEM_Static | (MEM_Blob | MEM_Ephem). Needed for #3850 --- src/box/sql/vdbeaux.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/box/sql/vdbeaux.c b/src/box/sql/vdbeaux.c index fc805e3aa..d477662a4 100644 --- a/src/box/sql/vdbeaux.c +++ b/src/box/sql/vdbeaux.c @@ -3231,7 +3231,8 @@ sql_vdbe_mem_alloc_region(Mem *vdbe_mem, uint32_t size) vdbe_mem->z = region_alloc(&fiber()->gc, size); if (vdbe_mem->z == NULL) return SQLITE_NOMEM; - MemSetTypeFlag(vdbe_mem, MEM_Blob | MEM_Ephem); + vdbe_mem->flags = MEM_Ephem | MEM_Blob; + assert(sqlite3VdbeCheckMemInvariants(vdbe_mem)); return SQLITE_OK; } -- 2.19.2