From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> To: tarantool-patches@dev.tarantool.org, korablev@tarantool.org Subject: [Tarantool-patches] [PATCH 1/1] vinyl: add missing diag_set in space creation Date: Thu, 21 May 2020 21:41:57 +0200 [thread overview] Message-ID: <43fb37622b80a324dd88e716e3c21d4672a200eb.1590090084.git.v.shpilevoy@tarantool.org> (raw) 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)
next reply other threads:[~2020-05-21 19:42 UTC|newest] Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-05-21 19:41 Vladislav Shpilevoy [this message] 2020-05-22 17:45 ` Nikita Pettik 2020-05-25 22:56 ` Vladislav Shpilevoy
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=43fb37622b80a324dd88e716e3c21d4672a200eb.1590090084.git.v.shpilevoy@tarantool.org \ --to=v.shpilevoy@tarantool.org \ --cc=korablev@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 1/1] vinyl: add missing diag_set in space creation' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox