diff options
author | Patrick Steinhardt <ps@pks.im> | 2023-03-27 10:08:25 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-03-27 19:52:06 +0200 |
commit | d3af1c193d4d62668a9d7ea98e2ef3771ac4e65a (patch) | |
tree | 98ac9fc6588baeebe0af3d5272e89a6107d447e9 /commit-graph.c | |
parent | commit-reach: add tips_reachable_from_bases() (diff) | |
download | git-d3af1c193d4d62668a9d7ea98e2ef3771ac4e65a.tar.xz git-d3af1c193d4d62668a9d7ea98e2ef3771ac4e65a.zip |
commit-graph: fix truncated generation numbers
In 80c928d947 (commit-graph: simplify compute_generation_numbers(),
2023-03-20), the code to compute generation numbers was simplified to
use the same infrastructure as is used to compute topological levels.
This refactoring introduced a bug where the generation numbers are
truncated when they exceed UINT32_MAX because we explicitly cast the
computed generation number to `uint32_t`. This is not required though:
both the computed value and the field of `struct commit_graph_data` are
of the same type `timestamp_t` already, so casting to `uint32_t` will
cause truncation.
This cast can cause us to miscompute generation data overflows:
1. Given a commit with no parents and committer date
`UINT32_MAX + 1`.
2. We compute its generation number as `UINT32_MAX + 1`, but
truncate it to `1`.
3. We calculate the generation offset via `$generation - $date`,
which is thus `1 - (UINT32_MAX + 1)`. The computation underflows
and we thus end up with an offset that is bigger than the maximum
allowed offset.
As a result, we'd be writing generation data overflow information into
the commit-graph that is bogus and ultimately not even required.
Fix this bug by removing the needless cast.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit-graph.c')
-rw-r--r-- | commit-graph.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/commit-graph.c b/commit-graph.c index 172e679db1..b96509354e 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -1565,7 +1565,7 @@ static timestamp_t get_generation_from_graph_data(struct commit *c, void *data) static void set_generation_v2(struct commit *c, timestamp_t t, void *data) { struct commit_graph_data *g = commit_graph_data_at(c); - g->generation = (uint32_t)t; + g->generation = t; } static void compute_generation_numbers(struct write_commit_graph_context *ctx) |