Ensure we account for packets having more data than expected

BeatTogether · Jul 27, 2024 · d196b46 · d196b46
1 parent cbe1fd0
commit d196b46
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/BeatTogether.DedicatedServer.Kernel/PacketSource.cs b/BeatTogether.DedicatedServer.Kernel/PacketSource.cs
@@ -167,6 +167,11 @@ public void OnReceive(EndPoint remoteEndPoint, ref SpanBuffer reader, IgnoranceC
                     continue;
                 }
 
+                // Ensure we always skip/rewind our reader
+                var processedBytesToSkip = HandleRead.Offset - prevPosition;
+                try { HandleRead.SkipBytes((int)length - processedBytesToSkip); }
+                catch (EndOfBufferException) { _logger.Warning("Packet was an incorrect length"); goto RoutePacket; }
+
                 ((Abstractions.IPacketHandler)packetHandler).Handle(sender, packet);
             }
             RoutePacket: