Skip to content

fix: number_hash should use u64 to avoid addition overflow #10615

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CPunisher merged 1 commit into from
Jun 10, 2025
Merged

fix: number_hash should use u64 to avoid addition overflow #10615

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions crates/rspack_util/src/number_hash.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,29 +10,29 @@ const SAFE_PART: usize = SAFE_LIMIT - 1;
const COUNT: usize = 4;

pub fn get_number_hash(str: &str, range: usize) -> usize {
let mut arr = [0usize; COUNT];
let primes = [3usize, 7usize, 17usize, 19usize];
let mut arr = [0u64; COUNT];
let primes = [3u64, 7u64, 17u64, 19u64];

for i in 0..str.len() {
let c = str.as_bytes()[i] as usize;
arr[0] = (arr[0] + c * primes[0] + arr[3]) & SAFE_PART;
arr[1] = (arr[1] + c * primes[1] + arr[0]) & SAFE_PART;
arr[2] = (arr[2] + c * primes[2] + arr[1]) & SAFE_PART;
arr[3] = (arr[3] + c * primes[3] + arr[2]) & SAFE_PART;
let c = str.as_bytes()[i] as u64;
arr[0] = (arr[0] + c * primes[0] + arr[3]) & SAFE_PART as u64;
arr[1] = (arr[1] + c * primes[1] + arr[0]) & SAFE_PART as u64;
arr[2] = (arr[2] + c * primes[2] + arr[1]) & SAFE_PART as u64;
arr[3] = (arr[3] + c * primes[3] + arr[2]) & SAFE_PART as u64;

arr[0] ^= arr[arr[0] % COUNT] >> 1;
arr[1] ^= arr[arr[1] % COUNT] >> 1;
arr[2] ^= arr[arr[2] % COUNT] >> 1;
arr[3] ^= arr[arr[3] % COUNT] >> 1;
arr[0] ^= arr[(arr[0] % COUNT as u64) as usize] >> 1;
arr[1] ^= arr[(arr[1] % COUNT as u64) as usize] >> 1;
arr[2] ^= arr[(arr[2] % COUNT as u64) as usize] >> 1;
arr[3] ^= arr[(arr[3] % COUNT as u64) as usize] >> 1;
}

if range <= SAFE_PART {
(arr[0] + arr[1] + arr[2] + arr[3]) % range
((arr[0] + arr[1] + arr[2] + arr[3]) % range as u64) as usize
} else {
let range_ext = range / SAFE_LIMIT;
let sum1 = (arr[0] + arr[2]) & SAFE_PART;
let sum2 = (arr[0] + arr[2]) % range_ext;
(sum2 * SAFE_LIMIT + sum1) % range
let sum1 = (arr[0] + arr[2]) & SAFE_PART as u64;
let sum2 = (arr[0] + arr[2]) % range_ext as u64;
((sum2 * SAFE_LIMIT as u64 + sum1) % range as u64) as usize
}
}

Expand Down
Loading