Merge pull request #79 from kralverde/more_packet_hardening

Buffer check for varint decoding
Pumpkin-MC · Sep 7, 2024 · cd25387 · cd25387
2 parents ca2e4e2 + e4106c3
commit cd25387
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/pumpkin-protocol/src/lib.rs b/pumpkin-protocol/src/lib.rs
@@ -44,6 +44,9 @@ impl VarInt {
     pub fn decode_partial(r: &mut &[u8]) -> Result<i32, VarIntDecodeError> {
         let mut val = 0;
         for i in 0..Self::MAX_SIZE {
+            if !r.has_remaining() {
+                return Err(VarIntDecodeError::Incomplete);
+            }
             let byte = r.get_u8();
             val |= (i32::from(byte) & 0b01111111) << (i * 7);
             if byte & 0b10000000 == 0 {
@@ -71,6 +74,9 @@ impl VarInt {
     pub fn decode(r: &mut &[u8]) -> Result<Self, VarIntDecodeError> {
         let mut val = 0;
         for i in 0..Self::MAX_SIZE {
+            if !r.has_remaining() {
+                return Err(VarIntDecodeError::Incomplete);
+            }
             let byte = r.get_u8();
             val |= (i32::from(byte) & 0b01111111) << (i * 7);
             if byte & 0b10000000 == 0 {