Skip to content

Commit d55fc51

Browse files
pks-tgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 77d1ae4 commit d55fc51

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

reftable/reader.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -509,6 +509,9 @@ static int reader_seek_indexed(struct reftable_reader *r,
509509
goto done;
510510

511511
err = reader_seek_linear(&index_iter, &want_index);
512+
if (err < 0)
513+
goto done;
514+
512515
while (1) {
513516
err = table_iter_next(&index_iter, &index_result);
514517
table_iter_block_done(&index_iter);

0 commit comments

Comments
 (0)