Skip to content

fix(s2n-quic-core): enforce checked arithmetics to prevent overflows #3081

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

Open
boquan-fang wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(s2n-quic-core): enforce checked arithmetics to prevent overflows #3081

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
60 changes: 14 additions & 46 deletions quic/s2n-quic-core/src/varint/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,11 +334,7 @@ impl core::ops::Add for VarInt {
#[inline]
#[track_caller]
fn add(self, rhs: Self) -> Self {
if cfg!(debug_assertions) {
self.checked_add(rhs).expect("VarInt overflow occurred")
} else {
Self(self.0 + rhs.0)
}
self.checked_add(rhs).expect("VarInt overflow occurred")
}
}

Expand All @@ -348,38 +344,26 @@ impl core::ops::Add<usize> for VarInt {
#[inline]
#[track_caller]
fn add(self, rhs: usize) -> Self {
if cfg!(debug_assertions) {
self.checked_add(VarInt::new(rhs as u64).expect("VarInt overflow occurred"))
.expect("VarInt overflow occurred")
} else {
Self(self.0 + rhs as u64)
}
self.checked_add(VarInt::new(rhs as u64).expect("VarInt overflow occurred"))
.expect("VarInt overflow occurred")
}
}

impl core::ops::AddAssign<Self> for VarInt {
#[inline]
#[track_caller]
fn add_assign(&mut self, rhs: Self) {
if cfg!(debug_assertions) {
*self = self.checked_add(rhs).expect("VarInt overflow occurred")
} else {
self.0 += rhs.0
}
*self = self.checked_add(rhs).expect("VarInt overflow occurred")
}
}

impl core::ops::AddAssign<usize> for VarInt {
#[inline]
#[track_caller]
fn add_assign(&mut self, rhs: usize) {
if cfg!(debug_assertions) {
*self = self
.checked_add(VarInt::new(rhs as u64).expect("VarInt overflow occurred"))
.expect("VarInt overflow occurred")
} else {
self.0 += rhs as u64
}
*self = self
.checked_add(VarInt::new(rhs as u64).expect("VarInt overflow occurred"))
.expect("VarInt overflow occurred")
}
}

Expand Down Expand Up @@ -429,11 +413,7 @@ impl core::ops::Mul for VarInt {
#[inline]
#[track_caller]
fn mul(self, rhs: Self) -> Self {
if cfg!(debug_assertions) {
self.checked_mul(rhs).expect("VarInt overflow occurred")
} else {
Self(self.0 * rhs.0)
}
self.checked_mul(rhs).expect("VarInt overflow occurred")
}
}

Expand All @@ -443,38 +423,26 @@ impl core::ops::Mul<usize> for VarInt {
#[inline]
#[track_caller]
fn mul(self, rhs: usize) -> Self {
if cfg!(debug_assertions) {
self.checked_mul(VarInt::new(rhs as u64).expect("VarInt overflow occurred"))
.expect("VarInt overflow occurred")
} else {
Self(self.0 * rhs as u64)
}
self.checked_mul(VarInt::new(rhs as u64).expect("VarInt overflow occurred"))
.expect("VarInt overflow occurred")
}
}

impl core::ops::MulAssign<Self> for VarInt {
#[inline]
#[track_caller]
fn mul_assign(&mut self, rhs: Self) {
if cfg!(debug_assertions) {
*self = self.checked_mul(rhs).expect("VarInt overflow occurred")
} else {
self.0 *= rhs.0
}
*self = self.checked_mul(rhs).expect("VarInt overflow occurred")
}
}

impl core::ops::MulAssign<usize> for VarInt {
#[inline]
#[track_caller]
fn mul_assign(&mut self, rhs: usize) {
if cfg!(debug_assertions) {
*self = self
.checked_mul(VarInt::new(rhs as u64).expect("VarInt overflow occurred"))
.expect("VarInt overflow occurred")
} else {
self.0 *= rhs as u64
}
*self = self
.checked_mul(VarInt::new(rhs as u64).expect("VarInt overflow occurred"))
.expect("VarInt overflow occurred")
}
}

Expand Down
Loading