Skip to content

Commit dfffc94

Browse files
committed
library: sub_timespec use arithmetic to avoid overflow
Signed-off-by: Eval EXEC <[email protected]>
1 parent aed0928 commit dfffc94

File tree

1 file changed

+7
-4
lines changed
  • library/std/src/sys/pal/unix

1 file changed

+7
-4
lines changed

library/std/src/sys/pal/unix/time.rs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,13 @@ impl Timespec {
139139
#[rustc_const_unstable(feature = "const_system_time", issue = "144517")]
140140
pub const fn sub_timespec(&self, other: &Timespec) -> Result<Duration, Duration> {
141141
// FIXME: const PartialOrd
142-
let mut cmp = self.tv_sec - other.tv_sec;
143-
if cmp == 0 {
144-
cmp = self.tv_nsec.as_inner() as i64 - other.tv_nsec.as_inner() as i64;
145-
}
142+
// Use saturating arithmetic to avoid overflow when comparing extreme values
143+
let mut cmp = self.tv_sec.saturating_sub(other.tv_sec);
144+
cmp = if cmp == 0 {
145+
self.tv_nsec.as_inner() as i64 - other.tv_nsec.as_inner() as i64
146+
} else {
147+
cmp
148+
};
146149

147150
if cmp >= 0 {
148151
// NOTE(eddyb) two aspects of this `if`-`else` are required for LLVM

0 commit comments

Comments
 (0)