diff options
| author | Taylor Blau <me@ttaylorr.com> | 2023-07-13 02:38:13 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-07-14 19:32:03 +0300 |
| commit | d76e0a744d3a8c1713f0e913325cab7da92f01ef (patch) | |
| tree | a8bc9e3f992a67b8fc27a33399edc07c1900b9b5 /commit-graph.c | |
| parent | 19565d093d248ba4c2330d96314a547feed41112 (diff) | |
commit-graph.c: prevent overflow in `merge_commit_graph()`
When merging two commit graphs, ensure that we don't attempt to merge
two graphs which, when combined, have more total commits than the 32-bit
unsigned maximum.
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit-graph.c')
| -rw-r--r-- | commit-graph.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/commit-graph.c b/commit-graph.c index d9795e3aa4..8333ce8e04 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -2179,6 +2179,11 @@ static void merge_commit_graph(struct write_commit_graph_context *ctx, uint32_t i; uint32_t offset = g->num_commits_in_base; + if (unsigned_add_overflows(ctx->commits.nr, g->num_commits)) + die(_("cannot merge graph %s, too many commits: %"PRIuMAX), + oid_to_hex(&g->oid), + (uintmax_t)st_add(ctx->commits.nr, g->num_commits)); + ALLOC_GROW(ctx->commits.list, ctx->commits.nr + g->num_commits, ctx->commits.alloc); for (i = 0; i < g->num_commits; i++) { |