Skip to content

fix: change all 1 to 1u64 to prevent unexpected overflow #72

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
jonathanpwang merged 1 commit into from
Jun 3, 2023
Merged

fix: change all 1 to 1u64 to prevent unexpected overflow #72

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
6 changes: 3 additions & 3 deletions halo2-base/src/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ pub(crate) fn decompose_u64_digits_to_limbs(
core::cmp::Ordering::Less => {
let mut limb = u64_digit;
u64_digit = e.next().unwrap_or(0);
limb |= (u64_digit & ((1 << (bit_len - rem)) - 1)) << rem;
limb |= (u64_digit & ((1u64 << (bit_len - rem)) - 1u64)) << rem;
u64_digit >>= bit_len - rem;
rem += 64 - bit_len;
limb
Expand Down Expand Up @@ -265,7 +265,7 @@ pub fn decompose_biguint<F: BigPrimeField>(
let mut rem = bit_len - 64;
let mut u64_digit = e.next().unwrap_or(0);
// Extract second limb (bit length 64) from e
limb0 |= ((u64_digit & ((1 << rem) - 1u64)) as u128) << 64u32;
limb0 |= ((u64_digit & ((1u64 << rem) - 1u64)) as u128) << 64u32;
u64_digit >>= rem;
rem = 64 - rem;

Expand All @@ -281,7 +281,7 @@ pub fn decompose_biguint<F: BigPrimeField>(
bits += 64;
}
rem = bit_len - bits;
limb |= ((u64_digit & ((1 << rem) - 1)) as u128) << bits;
limb |= ((u64_digit & ((1u64 << rem) - 1u64)) as u128) << bits;
u64_digit >>= rem;
rem = 64 - rem;
F::from_u128(limb)
Expand Down