summaryrefslogtreecommitdiffstats
path: root/reftable
diff options
context:
space:
mode:
authorPatrick Steinhardt <ps@pks.im>2024-12-22 08:24:28 +0100
committerJunio C Hamano <gitster@pobox.com>2024-12-22 09:58:23 +0100
commit8e27ee9220883cf5a0629c752e1642daaba4ce14 (patch)
treed923bde51c658d1b91d325d7d2adf68ed457a89d /reftable
parentreftable/basics: fix segfault when growing `names` array fails (diff)
downloadgit-8e27ee9220883cf5a0629c752e1642daaba4ce14.tar.xz
git-8e27ee9220883cf5a0629c752e1642daaba4ce14.zip
reftable/stack: don't perform auto-compaction with less than two tables
In order to compact tables we need at least two tables. Bail out early from `reftable_stack_auto_compact()` in case we have less than two tables. In the original, `stack_table_sizes_for_compaction()` yields an array that has the same length as the number of tables. This array is then passed on to `suggest_compaction_segment()`, which returns an empty segment in case we have less than two tables. The segment is then passed to `segment_size()`, which will return `0` because both start and end of the segment are `0`. And because we only call `stack_compact_range()` in case we have a positive segment size we don't perform auto-compaction at all. Consequently, this change does not result in a user-visible change in behaviour when called with a single table. But when called with no tables this protects us against a potential out-of-memory error: `stack_table_sizes_for_compaction()` would try to allocate a zero-byte object when there aren't any tables, and that may lead to a `NULL` pointer on some platforms like NonStop which causes us to bail out with an out-of-memory error. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'reftable')
-rw-r--r--reftable/stack.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/reftable/stack.c b/reftable/stack.c
index 63976e5cea..ae274cd51c 100644
--- a/reftable/stack.c
+++ b/reftable/stack.c
@@ -1552,6 +1552,9 @@ int reftable_stack_auto_compact(struct reftable_stack *st)
struct segment seg;
uint64_t *sizes;
+ if (st->merged->readers_len < 2)
+ return 0;
+
sizes = stack_table_sizes_for_compaction(st);
if (!sizes)
return REFTABLE_OUT_OF_MEMORY_ERROR;