reftable/reader: handle allocation failures in `reader_init_iter()`
Handle allocation failures in `reader_init_iter()`. This requires us to also adapt `reftable_reader_init_*_iterator()` to bubble up the new error codes. Adapt callers accordingly. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Patrick Steinhardt committed
Oct 2, 2024 at 12:55 UTC
0a8372f50924f4ee24deb6aed8361ba9e5a67f66
5 files changed
+50
-30
reftable/merged.c
+3
-1
@@ -244,7 +244,9 @@ int merged_table_init_iter(struct reftable_merged_table *mt,
244
245
for (size_t i = 0; i < mt->readers_len; i++) {
246
reftable_record_init(&subiters[i].rec, typ);
247
- reader_init_iter(mt->readers[i], &subiters[i].iter, typ);
247
+ ret = reader_init_iter(mt->readers[i], &subiters[i].iter, typ);
248
+ if (ret < 0)
249
+ goto out;
250
}
251
252
REFTABLE_CALLOC_ARRAY(mi, 1);
reftable/reader.c
+18
-10
@@ -554,32 +554,37 @@ static void iterator_from_table_iter(struct reftable_iterator *it,
554
it->ops = &table_iter_vtable;
555
}
556
557
-void reader_init_iter(struct reftable_reader *r,
558
- struct reftable_iterator *it,
559
- uint8_t typ)
557
+int reader_init_iter(struct reftable_reader *r,
558
+ struct reftable_iterator *it,
559
+ uint8_t typ)
560
{
561
struct reftable_reader_offsets *offs = reader_offsets_for(r, typ);
562
563
if (offs->is_present) {
564
struct table_iter *ti;
565
REFTABLE_ALLOC_ARRAY(ti, 1);
566
+ if (!ti)
567
+ return REFTABLE_OUT_OF_MEMORY_ERROR;
568
+
569
table_iter_init(ti, r);
570
iterator_from_table_iter(it, ti);
571
} else {
572
iterator_set_empty(it);
573
}
574
+
575
+ return 0;
576
}
577
573
-void reftable_reader_init_ref_iterator(struct reftable_reader *r,
574
- struct reftable_iterator *it)
578
+int reftable_reader_init_ref_iterator(struct reftable_reader *r,
579
+ struct reftable_iterator *it)
580
{
576
- reader_init_iter(r, it, BLOCK_TYPE_REF);
581
+ return reader_init_iter(r, it, BLOCK_TYPE_REF);
582
}
583
579
-void reftable_reader_init_log_iterator(struct reftable_reader *r,
580
- struct reftable_iterator *it)
584
+int reftable_reader_init_log_iterator(struct reftable_reader *r,
585
+ struct reftable_iterator *it)
586
{
582
- reader_init_iter(r, it, BLOCK_TYPE_LOG);
587
+ return reader_init_iter(r, it, BLOCK_TYPE_LOG);
588
}
589
590
int reftable_reader_new(struct reftable_reader **out,
@@ -689,7 +694,10 @@ static int reftable_reader_refs_for_indexed(struct reftable_reader *r,
694
struct indexed_table_ref_iter *itr = NULL;
695
696
/* Look through the reverse index. */
692
- reader_init_iter(r, &oit, BLOCK_TYPE_OBJ);
697
+ err = reader_init_iter(r, &oit, BLOCK_TYPE_OBJ);
698
+ if (err < 0)
699
+ goto done;
700
+
701
err = iterator_seek(&oit, &want);
702
if (err != 0)
703
goto done;
reftable/reader.h
+3
-3
@@ -56,9 +56,9 @@ struct reftable_reader {
56
57
const char *reader_name(struct reftable_reader *r);
58
59
-void reader_init_iter(struct reftable_reader *r,
60
- struct reftable_iterator *it,
61
- uint8_t typ);
59
+int reader_init_iter(struct reftable_reader *r,
60
+ struct reftable_iterator *it,
61
+ uint8_t typ);
62
63
/* initialize a block reader to read from `r` */
64
int reader_init_block_reader(struct reftable_reader *r, struct block_reader *br,
reftable/reftable-reader.h
+4
-4
@@ -46,12 +46,12 @@ void reftable_reader_incref(struct reftable_reader *reader);
46
void reftable_reader_decref(struct reftable_reader *reader);
47
48
/* Initialize a reftable iterator for reading refs. */
49
-void reftable_reader_init_ref_iterator(struct reftable_reader *r,
50
- struct reftable_iterator *it);
49
+int reftable_reader_init_ref_iterator(struct reftable_reader *r,
50
+ struct reftable_iterator *it);
51
52
/* Initialize a reftable iterator for reading logs. */
53
-void reftable_reader_init_log_iterator(struct reftable_reader *r,
54
- struct reftable_iterator *it);
53
+int reftable_reader_init_log_iterator(struct reftable_reader *r,
54
+ struct reftable_iterator *it);
55
56
/* returns the hash ID used in this table. */
57
uint32_t reftable_reader_hash_id(struct reftable_reader *r);
t/unit-tests/t-reftable-readwrite.c
+22
-12
@@ -206,7 +206,8 @@ static void t_log_write_read(void)
206
err = reftable_reader_new(&reader, &source, "file.log");
207
check(!err);
208
209
- reftable_reader_init_ref_iterator(reader, &it);
209
+ err = reftable_reader_init_ref_iterator(reader, &it);
210
+ check(!err);
211
212
err = reftable_iterator_seek_ref(&it, names[N - 1]);
213
check(!err);
@@ -221,8 +222,8 @@ static void t_log_write_read(void)
222
reftable_iterator_destroy(&it);
223
reftable_ref_record_release(&ref);
224
224
- reftable_reader_init_log_iterator(reader, &it);
225
-
225
+ err = reftable_reader_init_log_iterator(reader, &it);
226
+ check(!err);
227
err = reftable_iterator_seek_log(&it, "");
228
check(!err);
229
@@ -296,7 +297,8 @@ static void t_log_zlib_corruption(void)
297
err = reftable_reader_new(&reader, &source, "file.log");
298
check(!err);
299
299
- reftable_reader_init_log_iterator(reader, &it);
300
+ err = reftable_reader_init_log_iterator(reader, &it);
301
+ check(!err);
302
err = reftable_iterator_seek_log(&it, "refname");
303
check_int(err, ==, REFTABLE_ZLIB_ERROR);
304
@@ -325,7 +327,8 @@ static void t_table_read_write_sequential(void)
327
err = reftable_reader_new(&reader, &source, "file.ref");
328
check(!err);
329
328
- reftable_reader_init_ref_iterator(reader, &it);
330
+ err = reftable_reader_init_ref_iterator(reader, &it);
331
+ check(!err);
332
err = reftable_iterator_seek_ref(&it, "");
333
check(!err);
334
@@ -376,7 +379,8 @@ static void t_table_read_api(void)
379
err = reftable_reader_new(&reader, &source, "file.ref");
380
check(!err);
381
379
- reftable_reader_init_ref_iterator(reader, &it);
382
+ err = reftable_reader_init_ref_iterator(reader, &it);
383
+ check(!err);
384
err = reftable_iterator_seek_ref(&it, names[0]);
385
check(!err);
386
@@ -419,7 +423,8 @@ static void t_table_read_write_seek(int index, int hash_id)
423
}
424
425
for (i = 1; i < N; i++) {
422
- reftable_reader_init_ref_iterator(reader, &it);
426
+ err = reftable_reader_init_ref_iterator(reader, &it);
427
+ check(!err);
428
err = reftable_iterator_seek_ref(&it, names[i]);
429
check(!err);
430
err = reftable_iterator_next_ref(&it, &ref);
@@ -435,7 +440,8 @@ static void t_table_read_write_seek(int index, int hash_id)
440
strbuf_addstr(&pastLast, names[N - 1]);
441
strbuf_addstr(&pastLast, "/");
442
438
- reftable_reader_init_ref_iterator(reader, &it);
443
+ err = reftable_reader_init_ref_iterator(reader, &it);
444
+ check(!err);
445
err = reftable_iterator_seek_ref(&it, pastLast.buf);
446
if (err == 0) {
447
struct reftable_ref_record ref = { 0 };
@@ -534,7 +540,8 @@ static void t_table_refs_for(int indexed)
540
if (!indexed)
541
reader->obj_offsets.is_present = 0;
542
537
- reftable_reader_init_ref_iterator(reader, &it);
543
+ err = reftable_reader_init_ref_iterator(reader, &it);
544
+ check(!err);
545
err = reftable_iterator_seek_ref(&it, "");
546
check(!err);
547
reftable_iterator_destroy(&it);
@@ -593,7 +600,8 @@ static void t_write_empty_table(void)
600
err = reftable_reader_new(&rd, &source, "filename");
601
check(!err);
602
596
- reftable_reader_init_ref_iterator(rd, &it);
603
+ err = reftable_reader_init_ref_iterator(rd, &it);
604
+ check(!err);
605
err = reftable_iterator_seek_ref(&it, "");
606
check(!err);
607
@@ -802,7 +810,8 @@ static void t_write_multiple_indices(void)
810
* Seeking the log uses the log index now. In case there is any
811
* confusion regarding indices we would notice here.
812
*/
805
- reftable_reader_init_log_iterator(reader, &it);
813
+ err = reftable_reader_init_log_iterator(reader, &it);
814
+ check(!err);
815
err = reftable_iterator_seek_log(&it, "");
816
check(!err);
817
@@ -858,7 +867,8 @@ static void t_write_multi_level_index(void)
867
/*
868
* Seeking the last ref should work as expected.
869
*/
861
- reftable_reader_init_ref_iterator(reader, &it);
870
+ err = reftable_reader_init_ref_iterator(reader, &it);
871
+ check(!err);
872
err = reftable_iterator_seek_ref(&it, "refs/heads/199");
873
check(!err);
874