Merge branch 'master' into feature/block-limits-2

broxus · Jun 24, 2024 · 9dcf8ed · 9dcf8ed
2 parents 51e1256 + 7a174d9
commit 9dcf8ed
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/consensus/src/engine/input_buffer.rs b/consensus/src/engine/input_buffer.rs
@@ -95,12 +95,16 @@ impl InputBufferData {
             let to_drop = self
                 .data
                 .iter()
-                .take_while(|evicted| {
-                    self.data_bytes = self
-                        .data_bytes
-                        .checked_sub(evicted.len())
-                        .expect("decrease buffered data size on eviction");
-                    self.data_bytes > max_data_bytes
+                .take_while(|front| {
+                    // last call must not change `self`
+                    let take_more = self.data_bytes > max_data_bytes;
+                    if take_more {
+                        self.data_bytes = self
+                            .data_bytes
+                            .checked_sub(front.len())
+                            .expect("decrease buffered data size on eviction");
+                    }
+                    take_more
                 })
                 .count();