kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

pack-bitmap: reject pseudo-merge "sampleRate" of 0 

The "bitmapPseudoMerge.*.sampleRate" configuration controls what
fraction of unstable commits are included in each pseudo-merge group.
The config validation accepts values in the range `[0, 1]`, but a value
of exactly 0 causes a division by zero in `select_pseudo_merges_1()`:

    if (j % (uint32_t)(1.0 / group->sample_rate))

When `sample_rate` is 0, `1.0 / 0.0` produces `+inf`, and casting
infinity to `uint32_t` is undefined behavior in C. On most platforms
this yields 0, making the subsequent modulo operation (`j % 0`) a
fatal arithmetic trap.

This path was not previously reachable because an earlier bug caused
all pseudo-merge candidates to be classified as "stable" (where the
sampling rate is not used), regardless of their actual commit date. Now
that the date classification is fixed, the unstable path is exercised
and the division by zero can fire.

Fix this by changing the validation to require a strict lower bound and
thus reject 0.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
main
Taylor Blau 2026-05-11 20:47:06 -04:00 committed by Junio C Hamano
parent 78e85e05f3
commit 03c7a30cee
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/config/bitmap-pseudo-merge.adoc
View File

@ -47,8 +47,8 @@ will be updated more often than a reference pointing at an old commit.
bitmapPseudoMerge.<name>.sampleRate::
Determines the proportion of non-bitmapped commits (among
reference tips) which are selected for inclusion in an
unstable pseudo-merge bitmap. Must be between `0` and `1`
(inclusive). The default is `1`.
unstable pseudo-merge bitmap. Must be greater than `0` and
less than or equal to `1`. The default is `1`.

bitmapPseudoMerge.<name>.threshold::
Determines the minimum age of non-bitmapped commits (among

4
pseudo-merge.c
View File

@ -169,8 +169,8 @@ static int pseudo_merge_config(const char *var, const char *value,
}
} else if (!strcmp(key, "samplerate")) {
group->sample_rate = git_config_double(var, value, ctx->kvi);
if (!(0 <= group->sample_rate && group->sample_rate <= 1)) {
warning(_("%s must be between 0 and 1, using default"), var);
if (!(0 < group->sample_rate && group->sample_rate <= 1)) {
warning(_("%s must be between 0 (exclusive) and 1, using default"), var);
group->sample_rate = DEFAULT_PSEUDO_MERGE_SAMPLE_RATE;
}
} else if (!strcmp(key, "threshold")) {

2
t/t5333-pseudo-merge-bitmaps.sh
View File

@ -639,7 +639,7 @@ test_expect_success 'pseudo-merge commits are correctly classified by date' '
)
'

test_expect_failure 'sampleRate=0 does not cause division by zero' '
test_expect_success 'sampleRate=0 does not cause division by zero' '
test_when_finished "rm -fr pseudo-merge-sample-rate-zero" &&
git init pseudo-merge-sample-rate-zero &&
(