Panic on integer overflow in Chain::remaining (tokio-rs#482)

Make it safer.
lelongg · Jan 9, 2023 · 840c9aa · 840c9aa
1 parent d8d398b
commit 840c9aa
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/buf/chain.rs b/src/buf/chain.rs
@@ -135,7 +135,7 @@ where
     U: Buf,
 {
     fn remaining(&self) -> usize {
-        self.a.remaining() + self.b.remaining()
+        self.a.remaining().checked_add(self.b.remaining()).unwrap()
     }
 
     fn chunk(&self) -> &[u8] {
@@ -178,7 +178,10 @@ where
     U: BufMut,
 {
     fn remaining_mut(&self) -> usize {
-        self.a.remaining_mut() + self.b.remaining_mut()
+        self.a
+            .remaining_mut()
+            .checked_add(self.b.remaining_mut())
+            .unwrap()
     }
 
     fn chunk_mut(&mut self) -> &mut UninitSlice {