Fix addition overflow in AtomicPosition

src/draw_target.rs

@@ -351,7 +351,7 @@ impl RateLimiter {
 
         // We add `new` to `capacity`, subtract one for returning `true` from here,
         // then make sure it does not exceed a maximum of `MAX_BURST`, then store it.
-        self.capacity = Ord::min(MAX_BURST, self.capacity + new as u8 - 1);
+        self.capacity = Ord::min(MAX_BURST as u128, (self.capacity as u128) + new - 1) as u8;
         // Store `prev` for the next iteration after subtracting the `remainder`.
         self.prev = now - Duration::from_nanos(remainder as u64);
         true

src/progress_bar.rs

@@ -47,7 +47,7 @@ impl ProgressBar {
 
     /// Creates a new progress bar with a given length and draw target
     pub fn with_draw_target(len: Option<u64>, draw_target: ProgressDrawTarget) -> ProgressBar {
-        let pos = Arc::new(AtomicPosition::default());
+        let pos = Arc::new(AtomicPosition::new());
         ProgressBar {
             state: Arc::new(Mutex::new(BarState::new(len, draw_target, pos.clone()))),
             pos,

src/state.rs

@@ -418,6 +418,15 @@ pub(crate) struct AtomicPosition {
 }
 
 impl AtomicPosition {
+    pub(crate) fn new() -> Self {
+        Self {
+            pos: AtomicU64::new(0),
+            capacity: AtomicU8::new(MAX_BURST),
+            prev: AtomicU64::new(0),
+            start: Instant::now(),
+        }
+    }
+
     pub(crate) fn allow(&self, now: Instant) -> bool {
         if now < self.start {
             return false;
@@ -445,7 +454,7 @@ impl AtomicPosition {
         let (new, remainder) = ((diff / INTERVAL), (diff % INTERVAL));
         // We add `new` to `capacity`, subtract one for returning `true` from here,
         // then make sure it does not exceed a maximum of `MAX_BURST`.
-        capacity = Ord::min(MAX_BURST, capacity + new as u8 - 1);
+        capacity = Ord::min(MAX_BURST as u128, (capacity as u128) + (new as u128) - 1) as u8;
 
         // Then, we just store `capacity` and `prev` atomically for the next iteration
         self.capacity.store(capacity, Ordering::Release);
@@ -468,17 +477,6 @@ impl AtomicPosition {
     }
 }
 
-impl Default for AtomicPosition {
-    fn default() -> Self {
-        Self {
-            pos: AtomicU64::new(0),
-            capacity: AtomicU8::new(MAX_BURST),
-            prev: AtomicU64::new(0),
-            start: Instant::now(),
-        }
-    }
-}
-
 const INTERVAL: u64 = 1_000_000;
 const MAX_BURST: u8 = 10;
 
@@ -605,4 +603,12 @@ mod tests {
         // Should not panic.
         pb.set_position(0);
     }
+
+    #[test]
+    fn test_atomic_position_large_time_difference() {
+        let atomic_position = AtomicPosition::new();
+        let later = atomic_position.start + Duration::from_nanos(INTERVAL * u64::from(u8::MAX));
+        // Should not panic.
+        atomic_position.allow(later);
+    }
 }

src/style.rs

@@ -683,7 +683,7 @@ mod tests {
     #[test]
     fn test_expand_template() {
         const WIDTH: u16 = 80;
-        let pos = Arc::new(AtomicPosition::default());
+        let pos = Arc::new(AtomicPosition::new());
         let state = ProgressState::new(Some(10), pos);
         let mut buf = Vec::new();
 
@@ -707,7 +707,7 @@ mod tests {
         set_colors_enabled(true);
 
         const WIDTH: u16 = 80;
-        let pos = Arc::new(AtomicPosition::default());
+        let pos = Arc::new(AtomicPosition::new());
         let state = ProgressState::new(Some(10), pos);
         let mut buf = Vec::new();
 
@@ -737,7 +737,7 @@ mod tests {
     #[test]
     fn align_truncation() {
         const WIDTH: u16 = 10;
-        let pos = Arc::new(AtomicPosition::default());
+        let pos = Arc::new(AtomicPosition::new());
         let state = ProgressState::new(Some(10), pos);
         let mut buf = Vec::new();