Skip to content

Commit 0a8372f

Browse files
pks-tgitster
pks-t
authored and
gitster
committed
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 18da600 commit 0a8372f

File tree

5 files changed

+50
-30
lines changed

5 files changed

+50
-30
lines changed

‎reftable/merged.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,9 @@ int merged_table_init_iter(struct reftable_merged_table *mt,
244244

245245
for (size_t i = 0; i < mt->readers_len; i++) {
246246
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;
248250
}
249251

250252
REFTABLE_CALLOC_ARRAY(mi, 1);

‎reftable/reader.c

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -554,32 +554,37 @@ static void iterator_from_table_iter(struct reftable_iterator *it,
554554
it->ops = &table_iter_vtable;
555555
}
556556

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)
560560
{
561561
struct reftable_reader_offsets *offs = reader_offsets_for(r, typ);
562562

563563
if (offs->is_present) {
564564
struct table_iter *ti;
565565
REFTABLE_ALLOC_ARRAY(ti, 1);
566+
if (!ti)
567+
return REFTABLE_OUT_OF_MEMORY_ERROR;
568+
566569
table_iter_init(ti, r);
567570
iterator_from_table_iter(it, ti);
568571
} else {
569572
iterator_set_empty(it);
570573
}
574+
575+
return 0;
571576
}
572577

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)
575580
{
576-
reader_init_iter(r, it, BLOCK_TYPE_REF);
581+
return reader_init_iter(r, it, BLOCK_TYPE_REF);
577582
}
578583

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)
581586
{
582-
reader_init_iter(r, it, BLOCK_TYPE_LOG);
587+
return reader_init_iter(r, it, BLOCK_TYPE_LOG);
583588
}
584589

585590
int reftable_reader_new(struct reftable_reader **out,
@@ -689,7 +694,10 @@ static int reftable_reader_refs_for_indexed(struct reftable_reader *r,
689694
struct indexed_table_ref_iter *itr = NULL;
690695

691696
/* 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+
693701
err = iterator_seek(&oit, &want);
694702
if (err != 0)
695703
goto done;

‎reftable/reader.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ struct reftable_reader {
5656

5757
const char *reader_name(struct reftable_reader *r);
5858

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);
6262

6363
/* initialize a block reader to read from `r` */
6464
int reader_init_block_reader(struct reftable_reader *r, struct block_reader *br,

‎reftable/reftable-reader.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ void reftable_reader_incref(struct reftable_reader *reader);
4646
void reftable_reader_decref(struct reftable_reader *reader);
4747

4848
/* 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);
5151

5252
/* 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);
5555

5656
/* returns the hash ID used in this table. */
5757
uint32_t reftable_reader_hash_id(struct reftable_reader *r);

‎t/unit-tests/t-reftable-readwrite.c

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,8 @@ static void t_log_write_read(void)
206206
err = reftable_reader_new(&reader, &source, "file.log");
207207
check(!err);
208208

209-
reftable_reader_init_ref_iterator(reader, &it);
209+
err = reftable_reader_init_ref_iterator(reader, &it);
210+
check(!err);
210211

211212
err = reftable_iterator_seek_ref(&it, names[N - 1]);
212213
check(!err);
@@ -221,8 +222,8 @@ static void t_log_write_read(void)
221222
reftable_iterator_destroy(&it);
222223
reftable_ref_record_release(&ref);
223224

224-
reftable_reader_init_log_iterator(reader, &it);
225-
225+
err = reftable_reader_init_log_iterator(reader, &it);
226+
check(!err);
226227
err = reftable_iterator_seek_log(&it, "");
227228
check(!err);
228229

@@ -296,7 +297,8 @@ static void t_log_zlib_corruption(void)
296297
err = reftable_reader_new(&reader, &source, "file.log");
297298
check(!err);
298299

299-
reftable_reader_init_log_iterator(reader, &it);
300+
err = reftable_reader_init_log_iterator(reader, &it);
301+
check(!err);
300302
err = reftable_iterator_seek_log(&it, "refname");
301303
check_int(err, ==, REFTABLE_ZLIB_ERROR);
302304

@@ -325,7 +327,8 @@ static void t_table_read_write_sequential(void)
325327
err = reftable_reader_new(&reader, &source, "file.ref");
326328
check(!err);
327329

328-
reftable_reader_init_ref_iterator(reader, &it);
330+
err = reftable_reader_init_ref_iterator(reader, &it);
331+
check(!err);
329332
err = reftable_iterator_seek_ref(&it, "");
330333
check(!err);
331334

@@ -376,7 +379,8 @@ static void t_table_read_api(void)
376379
err = reftable_reader_new(&reader, &source, "file.ref");
377380
check(!err);
378381

379-
reftable_reader_init_ref_iterator(reader, &it);
382+
err = reftable_reader_init_ref_iterator(reader, &it);
383+
check(!err);
380384
err = reftable_iterator_seek_ref(&it, names[0]);
381385
check(!err);
382386

@@ -419,7 +423,8 @@ static void t_table_read_write_seek(int index, int hash_id)
419423
}
420424

421425
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);
423428
err = reftable_iterator_seek_ref(&it, names[i]);
424429
check(!err);
425430
err = reftable_iterator_next_ref(&it, &ref);
@@ -435,7 +440,8 @@ static void t_table_read_write_seek(int index, int hash_id)
435440
strbuf_addstr(&pastLast, names[N - 1]);
436441
strbuf_addstr(&pastLast, "/");
437442

438-
reftable_reader_init_ref_iterator(reader, &it);
443+
err = reftable_reader_init_ref_iterator(reader, &it);
444+
check(!err);
439445
err = reftable_iterator_seek_ref(&it, pastLast.buf);
440446
if (err == 0) {
441447
struct reftable_ref_record ref = { 0 };
@@ -534,7 +540,8 @@ static void t_table_refs_for(int indexed)
534540
if (!indexed)
535541
reader->obj_offsets.is_present = 0;
536542

537-
reftable_reader_init_ref_iterator(reader, &it);
543+
err = reftable_reader_init_ref_iterator(reader, &it);
544+
check(!err);
538545
err = reftable_iterator_seek_ref(&it, "");
539546
check(!err);
540547
reftable_iterator_destroy(&it);
@@ -593,7 +600,8 @@ static void t_write_empty_table(void)
593600
err = reftable_reader_new(&rd, &source, "filename");
594601
check(!err);
595602

596-
reftable_reader_init_ref_iterator(rd, &it);
603+
err = reftable_reader_init_ref_iterator(rd, &it);
604+
check(!err);
597605
err = reftable_iterator_seek_ref(&it, "");
598606
check(!err);
599607

@@ -802,7 +810,8 @@ static void t_write_multiple_indices(void)
802810
* Seeking the log uses the log index now. In case there is any
803811
* confusion regarding indices we would notice here.
804812
*/
805-
reftable_reader_init_log_iterator(reader, &it);
813+
err = reftable_reader_init_log_iterator(reader, &it);
814+
check(!err);
806815
err = reftable_iterator_seek_log(&it, "");
807816
check(!err);
808817

@@ -858,7 +867,8 @@ static void t_write_multi_level_index(void)
858867
/*
859868
* Seeking the last ref should work as expected.
860869
*/
861-
reftable_reader_init_ref_iterator(reader, &it);
870+
err = reftable_reader_init_ref_iterator(reader, &it);
871+
check(!err);
862872
err = reftable_iterator_seek_ref(&it, "refs/heads/199");
863873
check(!err);
864874

0 commit comments

Comments
 (0)