[Tarantool-patches] [PATCH 1/1] vinyl: add missing diag_set in space creation
Vladislav Shpilevoy
v.shpilevoy at tarantool.org
Thu May 21 22:41:57 MSK 2020
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)
More information about the Tarantool-patches
mailing list