Skip to content

Return Error::Overflow from WeightedIndex on float weight overflow - #1808

Merged
dhardy merged 1 commit into
rust-random:masterfrom
teddytennant:weighted-index-float-overflow
Jul 29, 2026
Merged

dhardy merged 1 commit into
rust-random:masterfrom
teddytennant:weighted-index-float-overflow

Conversation

@teddytennant

Copy link
Copy Markdown
Contributor
  • Added a CHANGELOG.md entry

Summary

WeightedIndex::new and update_weights panic when the sum of float weights reaches infinity. Return Error::Overflow instead, as already documented and as done for integer weights.

Motivation

WeightedIndex::new documents Error::Overflow when the sum of weights overflows, but Weight::checked_add_assign never errors for floats — the sum just becomes infinite. UniformFloat::new then rejects the non-finite bound and the .unwrap() on X::Sampler::new panics:

WeightedIndex::new([f64::MAX, f64::MAX]); // panics: NonFinite

#1353 fixed this for integer weights; float weights were missed.

update_weights has the same unwrap, and worse: it panics after the cumulative weights have already been mutated, violating the documented "in case of error, self is not modified" contract.

Details

  • In new, map the sampler error to Error::Overflow.
  • In update_weights, construct the new sampler during the pre-mutation check phase (mapping the error the same way) so a failure leaves self untouched, and document Error::Overflow in its error list.
  • Added an overflow_float test covering f64::MAX + f64::MAX, f32, an explicitly infinite weight, and that a failed update_weights leaves the distribution unmodified.

Tested with cargo test --lib weighted (14 tests pass); cargo fmt --check and cargo clippy --lib are clean.

WeightedIndex::new documents Error::Overflow when the sum of weights
overflows, but Weight::checked_add_assign never errors for floats, so a
sum reaching infinity hit the unwrap on Sampler::new and panicked with
NonFinite. The same unwrap in update_weights also panicked after the
cumulative weights were already mutated, violating the documented
"in case of error, self is not modified" contract.

Map the sampler error to Error::Overflow in new, and in update_weights
construct the new sampler during the pre-mutation check phase.
rust-random#1353 fixed this for integer weights; floats were missed.
Copilot AI review requested due to automatic review settings July 11, 2026 12:32

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

@dhardy dhardy left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The issue here is that Weight::checked_add_assign was relied on to avoid overflow in fn new, yet it does no such thing for floats. Can you add a note to its docs clarifying that the implementation for floats does not trap overflow-to-inf or nan?

Otherwise, I think this approach is reasonable. Fn update_weights still has a potential issue with integer overflows but lets not address that here.

@dhardy

dhardy commented Jul 29, 2026

Copy link
Copy Markdown
Member

I added a note to #1814.

@dhardy
dhardy merged commit 2c1aba5 into rust-random:master Jul 29, 2026
18 checks passed
kodiakhq Bot pushed a commit to pdylanross/fatigue that referenced this pull request Sep 23, 2026
Bumps rand from 0.10.2 to 0.10.3.

Changelog
Sourced from rand's changelog.

[0.10.3] — 2026-09-20
Fixes

Fix WeightedIndex panic when the sum of float weights is infinite; return Error::Overflow instead (#1808)
Fix spurious Error::NonFinite from Uniform::new_inclusive on large finite float ranges such as 0.0..=f64::MAX (#1821)
Fix possible panic due to sampling a deserialized Uniform<char> (#1831)

Changes

Report exact remaining lengths from WeightedIndex::weights() and reduce overhead when reading weights (#1838)

#1808: rust-random/rand#1808
#1821: rust-random/rand#1821
#1831: rust-random/rand#1831
#1838: rust-random/rand#1838



Commits

9e7d328 Prepare rand 0.10.3 (#1840)
f73ce74 Optimize WeightedIndex weight lookup and iteration (#1838)
ef9e044 Avoid panic from deserialized Uniform\<char> where range == 0 (#1831)
c994eb1 docs: fix angle unit in quick start example (#1839)
33dea4f Test that WeightedIndex rejects INFINITY with Error::Overflow (#1822)
94c9078 Fix Uniform::new_inclusive overflow on large finite float ranges (#1821)
bb1262f Use Xoshiro256PlusPlus in examples/rayon-monte-carlo.rs (#1805)
521fab6 Stop pinning dependencies (#1820)
3f7c433 Stop pinning dependencies
cf4f73e sample_efraimidis_spirakis: error on more than amount non-finite weights (#1814)
Additional commits viewable in compare view




Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

@dependabot rebase will rebase this PR
@dependabot recreate will recreate this PR, overwriting any edits that have been made to it
@dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
@dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
@dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
@dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
renovate Bot added a commit to gwennlbh/shapemaker that referenced this pull request Sep 27, 2026
##### [v0.10.3](https://github.com/rust-random/rand/blob/HEAD/CHANGELOG.md#0103--2026-09-20)

##### Fixes

- Fix `WeightedIndex` panic when the sum of float weights is infinite; return `Error::Overflow` instead ([#1808])
- Fix spurious `Error::NonFinite` from `Uniform::new_inclusive` on large finite float ranges such as `0.0..=f64::MAX` ([#1821])
- Fix possible panic due to sampling a deserialized `Uniform<char>` ([#1831])

##### Changes

- Report exact remaining lengths from `WeightedIndex::weights()` and reduce overhead when reading weights ([#1838])

[#1808]: rust-random/rand#1808

[#1821]: rust-random/rand#1821

[#1831]: rust-random/rand#1831

[#1838]: rust-random/rand#1838
##### [v0.10.2](https://github.com/rust-random/rand/blob/HEAD/CHANGELOG.md#0102--2026-07-02)

##### Fixes

- Fix possible memory safety violation due to deserialization of `UniformChar` from bad source ([#1790])

##### Changes

- Document required output order of fn `partial_shuffle` and apply `#[must_use]` ([#1769])
- Avoid usage of `unsafe` in contexts where non-local memory corruption could invalidate contract ([#1791])

[#1769]: rust-random/rand#1769

[#1790]: rust-random/rand#1790

[#1791]: rust-random/rand#1791
##### [v0.10.1](https://github.com/rust-random/rand/blob/HEAD/CHANGELOG.md#0101--2026-02-11)

This release includes a fix for a soundness bug; see [#1763].

##### Changes

- Document panic behavior of `make_rng` and add `#[track_caller]` ([#1761])
- Deprecate feature `log` ([#1763])

[#1761]: rust-random/rand#1761

[#1763]: rust-random/rand#1763
##### [v0.10.0](https://github.com/rust-random/rand/blob/HEAD/CHANGELOG.md#0100---2026-02-08)

##### Changes

- The dependency on `rand_chacha` has been replaced with a dependency on `chacha20`. This changes the implementation behind `StdRng`, but the output remains the same. There may be some API breakage when using the ChaCha-types directly as these are now the ones in `chacha20` instead of `rand_chacha` ([#1642]).
- Rename fns `IndexedRandom::choose_multiple` -> `sample`, `choose_multiple_array` -> `sample_array`, `choose_multiple_weighted` -> `sample_weighted`, struct `SliceChooseIter` -> `IndexedSamples` and fns `IteratorRandom::choose_multiple` -> `sample`, `choose_multiple_fill` -> `sample_fill` ([#1632])
- Use Edition 2024 and MSRV 1.85 ([#1653])
- Let `Fill` be implemented for element types, not sliceable types ([#1652])
- Fix `OsError::raw_os_error` on UEFI targets by returning `Option<usize>` ([#1665])
- Replace fn `TryRngCore::read_adapter(..) -> RngReadAdapter` with simpler struct `RngReader` ([#1669])
- Remove fns `SeedableRng::from_os_rng`, `try_from_os_rng` ([#1674])
- Remove `Clone` support for `StdRng`, `ReseedingRng` ([#1677])
- Use `postcard` instead of `bincode` to test the serde feature ([#1693])
- Avoid excessive allocation in `IteratorRandom::sample` when `amount` is much larger than iterator size ([#1695])
- Rename `os_rng` -> `sys_rng`, `OsRng` -> `SysRng`, `OsError` -> `SysError` ([#1697])
- Rename `Rng` -> `RngExt` as upstream `rand_core` has renamed `RngCore` -> `Rng` ([#1717])

##### Additions

- Add fns `IndexedRandom::choose_iter`, `choose_weighted_iter` ([#1632])
- Pub export `Xoshiro128PlusPlus`, `Xoshiro256PlusPlus` prngs ([#1649])
- Pub export `ChaCha8Rng`, `ChaCha12Rng`, `ChaCha20Rng` behind `chacha` feature ([#1659])
- Fn `rand::make_rng() -> R where R: SeedableRng` ([#1734])

##### Removals

- Removed `ReseedingRng` ([#1722])
- Removed unused feature "nightly" ([#1732])
- Removed feature `small_rng` ([#1732])

[#1632]: rust-random/rand#1632

[#1642]: rust-random/rand#1642

[#1649]: rust-random/rand#1649

[#1652]: rust-random/rand#1652

[#1653]: rust-random/rand#1653

[#1659]: rust-random/rand#1659

[#1665]: rust-random/rand#1665

[#1669]: rust-random/rand#1669

[#1674]: rust-random/rand#1674

[#1677]: rust-random/rand#1677

[#1693]: rust-random/rand#1693

[#1695]: rust-random/rand#1695

[#1697]: rust-random/rand#1697

[#1717]: rust-random/rand#1717

[#1722]: rust-random/rand#1722

[#1732]: rust-random/rand#1732

[#1734]: rust-random/rand#1734
##### [v0.9.5](https://github.com/rust-random/rand/releases/tag/0.9.5)

#### What's Changed

- rand v0.9.5: backport [#1790](rust-random/rand#1790) by [@dhardy](https://github.com/dhardy) in [#1803](rust-random/rand#1803)

**Full Changelog**: <rust-random/rand@0.9.4...0.9.5>
##### [v0.9.4](https://github.com/rust-random/rand/releases/tag/0.9.4)

##### Fixes

- Fix doc build ([#1766])

[#1766]: rust-random/rand#1766

**Full Changelog**: <rust-random/rand@0.9.3...0.9.4>
##### [v0.9.3](rust-random/rand@0.9.2...0.9.3)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants