From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp45.i.mail.ru (smtp45.i.mail.ru [94.100.177.105]) (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 9EB74469710 for ; Thu, 21 May 2020 22:42:00 +0300 (MSK) From: Vladislav Shpilevoy Date: Thu, 21 May 2020 21:41:57 +0200 Message-Id: <43fb37622b80a324dd88e716e3c21d4672a200eb.1590090084.git.v.shpilevoy@tarantool.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH 1/1] vinyl: add missing diag_set in space creation List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tarantool-patches@dev.tarantool.org, korablev@tarantool.org vinyl_engine_create_space() didn't set an error in the diagnostics area when region_alloc() failed. This could lead to a crash, although was almost impossible to happen. --- Branch: http://github.com/tarantool/tarantool/tree/gerold103/vinyl-add-missing-diag src/box/vinyl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/box/vinyl.c b/src/box/vinyl.c index ea4839dea..950a5508c 100644 --- a/src/box/vinyl.c +++ b/src/box/vinyl.c @@ -602,9 +602,11 @@ vinyl_engine_create_space(struct engine *engine, struct space_def *def, struct index_def *index_def; rlist_foreach_entry(index_def, key_list, link) key_count++; - struct key_def **keys = region_alloc(&fiber()->gc, - sizeof(*keys) * key_count); + struct key_def **keys; + size_t size = sizeof(*keys) * key_count; + keys = region_alloc(&fiber()->gc, size); if (keys == NULL) { + diag_set(OutOfMemory, size, "region_alloc", "keys"); free(space); return NULL; } -- 2.21.1 (Apple Git-122.3)