aboutsummaryrefslogtreecommitdiffstats
path: root/reftable
diff options
context:
space:
mode:
authorPatrick Steinhardt <ps@pks.im>2024-02-01 08:51:56 +0100
committerJunio C Hamano <gitster@pobox.com>2024-02-01 11:11:32 -0800
commitd55fc5128b26a64c2e7b6612d0442c9e924696e8 (patch)
treeea29fad2f2503e9a8dc1741c88327c1e88a4ef33 /reftable
parent77d1ae47937f35352efe22a960b544088f2f6158 (diff)
downloadgit-d55fc5128b26a64c2e7b6612d0442c9e924696e8.tar.gz
reftable/reader: be more careful about errors in indexed seeks
When doing an indexed seek we first need to do a linear seek in order to find the index block for our wanted key. We do not check the returned error of the linear seek though. This is likely not an issue because the next call to `table_iter_next()` would return error, too. But it very much is a code smell when an error variable is being assigned to without actually checking it. Safeguard the code by checking for errors. 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/reader.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/reftable/reader.c b/reftable/reader.c
index 64dc366fb1..278f727a3d 100644
--- a/reftable/reader.c
+++ b/reftable/reader.c
@@ -509,6 +509,9 @@ static int reader_seek_indexed(struct reftable_reader *r,
goto done;
err = reader_seek_linear(&index_iter, &want_index);
+ if (err < 0)
+ goto done;
+
while (1) {
err = table_iter_next(&index_iter, &index_result);
table_iter_block_done(&index_iter);