[PATCH 4/8] commit-graph: read `GDAT` chunk with `pair_chunk_expect()`
- From
Taylor Blau <me@ttaylorr.com>
- Date
- Oct 13, 2023, 19:25 UTC
- Message-ID
- <898b5bdb033518f2022d41b3cb5f03f71cc90070.1697225110.git.me@ttaylorr.com>
- In-Reply-To
- <cover.1697225110.git.me@ttaylorr.com>
Perform an identical conversion as in previous commits to read the GDAT chunk.
Signed-off-by: Taylor Blau <me@ttaylorr.com> --- commit-graph.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/commit-graph.c b/commit-graph.c index 97d4824673..0fab99f5dd 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -330,16 +330,6 @@ static int graph_read_oid_lookup(const unsigned char *chunk_start, return 0; } -static int graph_read_generation_data(const unsigned char *chunk_start, - size_t chunk_size, void *data) -{ - struct commit_graph *g = data; - if (chunk_size != g->num_commits * sizeof(uint32_t)) - return error("commit-graph generations chunk is wrong size"); - g->chunk_generation_data = chunk_start; - return 0; -} - static int graph_read_bloom_index(const unsigned char *chunk_start, size_t chunk_size, void *data) { @@ -457,8 +447,11 @@ struct commit_graph *parse_commit_graph(struct repo_settings *s, &graph->chunk_base_graphs_size); if (s->commit_graph_generation_version >= 2) { - read_chunk(cf, GRAPH_CHUNKID_GENERATION_DATA, - graph_read_generation_data, graph); + if (pair_chunk_expect(cf, GRAPH_CHUNKID_GENERATION_DATA, + &graph->chunk_generation_data, + st_mult(graph->num_commits, + sizeof(uint32_t)))) + error(_("commit-graph generations chunk is wrong size")); pair_chunk(cf, GRAPH_CHUNKID_GENERATION_DATA_OVERFLOW, &graph->chunk_generation_data_overflow, &graph->chunk_generation_data_overflow_size);
-- 2.42.0.352.gd9c5062ff7.dirty