dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix assertion failure in RequestContentList with many GRFs

Browse Source
This commit is contained in:
Jonathan G Rennison
2018-06-11 01:47:44 +01:00
parent 2c7b96cf1e
commit 847a46d107
1 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/network/network_content.cpp
View File

@@ -248,25 +248,31 @@ void ClientNetworkContentSocketHandler::RequestContentList(ContentVector *cv, bo
this->Connect(); this->Connect();
assert(cv->Length() < 255); const uint max_per_packet = min<uint>(255, (SEND_MTU - sizeof(PacketSize) - sizeof(byte) - sizeof(uint8)) /
assert(cv->Length() < (SEND_MTU - sizeof(PacketSize) - sizeof(byte) - sizeof(uint8)) / (sizeof(uint8) + sizeof(uint32) + (send_md5sum ? /*sizeof(ContentInfo::md5sum)*/16 : 0))) - 1;
(sizeof(uint8) + sizeof(uint32) + (send_md5sum ? /*sizeof(ContentInfo::md5sum)*/16 : 0)));
Packet *p = new Packet(send_md5sum ? PACKET_CONTENT_CLIENT_INFO_EXTID_MD5 : PACKET_CONTENT_CLIENT_INFO_EXTID); uint offset = 0;
p->Send_uint8(cv->Length());
for (ContentIterator iter = cv->Begin(); iter != cv->End(); iter++) { while (cv->Length() > offset) {
const ContentInfo *ci = *iter; Packet *p = new Packet(send_md5sum ? PACKET_CONTENT_CLIENT_INFO_EXTID_MD5 : PACKET_CONTENT_CLIENT_INFO_EXTID);
p->Send_uint8((byte)ci->type); const uint to_send = min<uint>(cv->Length() - offset, max_per_packet);
p->Send_uint32(ci->unique_id); p->Send_uint8(to_send);
if (!send_md5sum) continue;
for (uint j = 0; j < sizeof(ci->md5sum); j++) { for (uint i = 0; i < to_send; i++) {
p->Send_uint8(ci->md5sum[j]); const ContentInfo *ci = (*cv)[offset + i];
p->Send_uint8((byte)ci->type);
p->Send_uint32(ci->unique_id);
if (!send_md5sum) continue;
for (uint j = 0; j < sizeof(ci->md5sum); j++) {
p->Send_uint8(ci->md5sum[j]);
}
} }
}
this->SendPacket(p); this->SendPacket(p);
offset += to_send;
}
for (ContentIterator iter = cv->Begin(); iter != cv->End(); iter++) { for (ContentIterator iter = cv->Begin(); iter != cv->End(); iter++) {
ContentInfo *ci = *iter; ContentInfo *ci = *iter;