From: Taylor Blau <me@ttaylorr.com>
To: git@vger.kernel.org
Cc: Jeff King <peff@peff.net>, Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 4/7] commit-graph: read `GDAT` chunk with `pair_chunk_expect()`
Date: Thu, 9 Nov 2023 17:34:21 -0500 [thread overview]
Message-ID: <dcde17455ceb135b5298e86e8256e62cf05ed124.1699569246.git.me@ttaylorr.com> (raw)
In-Reply-To: <cover.1699569246.git.me@ttaylorr.com>
The `GDAT` chunk can benefit from the new chunk-format API function
described in the previous commit. Convert it to `pair_chunk_expect()`
accordingly.
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 67ab0f2448..3b456d199f 100644
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -299,16 +299,6 @@ static int graph_read_oid_fanout(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 / sizeof(uint32_t) != g->num_commits)
- 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)
{
@@ -433,8 +423,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,
+ sizeof(uint32_t),
+ graph->num_commits))
+ 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.43.0.rc0.39.g44bd344727
next prev parent reply other threads:[~2023-11-09 22:34 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-09 7:03 [PATCH 0/9] some more chunk-file bounds-checks fixes Jeff King
2023-11-09 7:09 ` [PATCH 1/9] commit-graph: handle overflow in chunk_size checks Jeff King
2023-11-09 21:13 ` Taylor Blau
2023-11-09 21:27 ` Jeff King
2023-11-09 7:12 ` [PATCH 2/9] midx: check consistency of fanout table Jeff King
2023-11-09 7:13 ` [PATCH 3/9] commit-graph: drop redundant call to "lite" verification Jeff King
2023-11-09 7:14 ` [PATCH 4/9] commit-graph: clarify missing-chunk error messages Jeff King
2023-11-09 7:17 ` [PATCH 5/9] commit-graph: abort as soon as we see a bogus chunk Jeff King
2023-11-09 21:18 ` Taylor Blau
2023-11-09 7:24 ` [PATCH 6/9] commit-graph: use fanout value for graph size Jeff King
2023-11-09 21:20 ` Taylor Blau
2023-11-09 21:38 ` Jeff King
2023-11-09 22:15 ` Taylor Blau
2023-11-10 21:52 ` Jeff King
2023-11-09 7:25 ` [PATCH 7/9] commit-graph: check order while reading fanout chunk Jeff King
2023-11-09 7:25 ` [PATCH 8/9] commit-graph: drop verify_commit_graph_lite() Jeff King
2023-11-09 7:26 ` [PATCH 9/9] commit-graph: mark chunk error messages for translation Jeff King
2023-11-09 21:22 ` [PATCH 0/9] some more chunk-file bounds-checks fixes Taylor Blau
2023-11-09 22:34 ` [PATCH 0/7] chunk-format: introduce `pair_chunk_expect()` Taylor Blau
2023-11-09 22:34 ` [PATCH 1/7] chunk-format: introduce `pair_chunk_expect()` helper Taylor Blau
2023-11-10 4:55 ` Junio C Hamano
2023-11-10 16:27 ` Taylor Blau
2023-11-10 22:01 ` Jeff King
2023-11-10 23:39 ` Junio C Hamano
2023-11-10 23:38 ` Junio C Hamano
2023-11-10 21:57 ` Jeff King
2023-11-10 22:09 ` Jeff King
2023-11-10 22:08 ` Jeff King
2024-01-15 22:31 ` Linus Arver
2024-01-15 22:53 ` Linus Arver
2024-01-16 15:10 ` Jeff King
2024-01-18 23:59 ` Linus Arver
2023-11-09 22:34 ` [PATCH 2/7] commit-graph: read `OIDL` chunk with `pair_chunk_expect()` Taylor Blau
2023-11-10 22:10 ` Jeff King
2023-11-09 22:34 ` [PATCH 3/7] commit-graph: read `CDAT` " Taylor Blau
2023-11-09 22:34 ` Taylor Blau [this message]
2023-11-09 22:34 ` [PATCH 5/7] commit-graph: read `BIDX` " Taylor Blau
2023-11-09 22:34 ` [PATCH 6/7] midx: read `OIDL` " Taylor Blau
2023-11-09 22:34 ` [PATCH 7/7] midx: read `OOFF` " Taylor Blau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=dcde17455ceb135b5298e86e8256e62cf05ed124.1699569246.git.me@ttaylorr.com \
--to=me@ttaylorr.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).