BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

GOTBLOCKS & DELETEBLOCKS: test packet size only once

Browse Source
This commit is contained in:
nerzhul 2016-02-23 10:58:13 +01:00
parent f3f4af3fb9
commit 147425483a
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/network/serverpackethandler.cpp
View File

@ -762,14 +762,14 @@ void Server::handleCommand_GotBlocks(NetworkPacket* pkt)
RemoteClient *client = getClient(pkt->getPeerId()); RemoteClient *client = getClient(pkt->getPeerId());
for (u16 i = 0; i < count; i++) { if ((s16)pkt->getSize() < 1 + (int)count * 6) {
if ((s16)pkt->getSize() < 1 + (i + 1) * 6) throw con::InvalidIncomingDataException
throw con::InvalidIncomingDataException
("GOTBLOCKS length is too short"); ("GOTBLOCKS length is too short");
}
for (u16 i = 0; i < count; i++) {
v3s16 p; v3s16 p;
*pkt >> p; *pkt >> p;
client->GotBlock(p); client->GotBlock(p);
} }
} }
@ -865,13 +865,14 @@ void Server::handleCommand_DeletedBlocks(NetworkPacket* pkt)
RemoteClient *client = getClient(pkt->getPeerId()); RemoteClient *client = getClient(pkt->getPeerId());
for (u16 i = 0; i < count; i++) { if ((s16)pkt->getSize() < 1 + (int)count * 6) {
if ((s16)pkt->getSize() < 1 + (i + 1) * 6) throw con::InvalidIncomingDataException
throw con::InvalidIncomingDataException
("DELETEDBLOCKS length is too short"); ("DELETEDBLOCKS length is too short");
}
for (u16 i = 0; i < count; i++) {
v3s16 p; v3s16 p;
*pkt >> p; *pkt >> p;
client->SetBlockNotSent(p); client->SetBlockNotSent(p);
} }
} }