mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix: Thread unsafe use of SendPacket for PACKET_SERVER_MAP_SIZE 

NetworkTCPSocketHandler::SendPacket is not thread safe and may not
be used concurrently from multiple threads without suitable locking
pull/8268/head
Jonathan G Rennison 2020-06-18 17:23:50 +01:00 committed by Charles Pigott
parent de4dc792a9
commit 053d4f3bff
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/network/network_server.cpp
View File

@ -153,6 +153,16 @@ struct PacketWriter : SaveFilter {
this->current = nullptr; this->current = nullptr;
} }
/** Prepend the current packet to the queue. */
void PrependQueue()
{
if (this->current == nullptr) return;
this->current->next = this->packets;
this->packets = this->current;
this->current = nullptr;
}
void Write(byte *buf, size_t size) override void Write(byte *buf, size_t size) override
{ {
/* We want to abort the saving when the socket is closed. */ /* We want to abort the saving when the socket is closed. */
@ -193,9 +203,9 @@ struct PacketWriter : SaveFilter {
this->AppendQueue(); this->AppendQueue();
/* Fast-track the size to the client. */ /* Fast-track the size to the client. */
Packet *p = new Packet(PACKET_SERVER_MAP_SIZE); this->current = new Packet(PACKET_SERVER_MAP_SIZE);
p->Send_uint32((uint32)this->total_size); this->current->Send_uint32((uint32)this->total_size);
this->cs->NetworkTCPSocketHandler::SendPacket(p); this->PrependQueue();
} }
}; };