mirror of
https://github.com/OpenTTD/OpenTTD.git
synced 2025-03-12 18:40:29 +00:00
(svn r8000) -Codechange: drop UDP packets when their internal size does not match the received size. If that is the case, the packet was not received in one piece (or got somehow mangled with another packet), which will cause us to drop the packet later on because we are (for example) trying to read beyond the end of the packet.
This commit is contained in:
parent
53576542d1
commit
293d8ba826
@ -116,11 +116,19 @@ void NetworkUDPReceive(const SOCKET udp)
|
||||
/* Try to receive anything */
|
||||
nbytes = recvfrom(udp, p.buffer, packet_len, 0, (struct sockaddr *)&client_addr, &client_len);
|
||||
|
||||
/* We got some bytes for the base header of the packet.
|
||||
* Assume we received the whole packet. */
|
||||
/* We got some bytes for the base header of the packet. */
|
||||
if (nbytes > 2) {
|
||||
NetworkRecv_ReadPacketSize(&p);
|
||||
|
||||
/* If the size does not match the packet must be corrupted.
|
||||
* Otherwise it will be marked as corrupted later on. */
|
||||
if (nbytes != p.size) {
|
||||
DEBUG(net, 1, "received a packet with mismatching size from %s:%d",
|
||||
inet_ntoa(client_addr.sin_addr), ntohs(client_addr.sin_port));
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
/* Put the position on the right place */
|
||||
p.pos = 2;
|
||||
p.next = NULL;
|
||||
|
Loading…
Reference in New Issue
Block a user