Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 12:57:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5671 from birarda/ice-server-crash

Browse source 
don't read ice-server packets that are too small
This commit is contained in:
Seth Alves 2015-08-28 12:46:23 -07:00
commit 0ca9b60be5
1 changed files with 41 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ice-server/src/IceServer.cpp
View file

@ -55,6 +55,9 @@ void IceServer::processDatagrams() {
_serverSocket.readDatagram(buffer.get(), packetSizeWithHeader, _serverSocket.readDatagram(buffer.get(), packetSizeWithHeader,
sendingSockAddr.getAddressPointer(), sendingSockAddr.getPortPointer()); sendingSockAddr.getAddressPointer(), sendingSockAddr.getPortPointer());
// make sure that this packet at least looks like something we can read
if (packetSizeWithHeader >= Packet::localHeaderSize(PacketType::ICEServerHeartbeat)) {
auto packet = Packet::fromReceivedPacket(std::move(buffer), packetSizeWithHeader, sendingSockAddr); auto packet = Packet::fromReceivedPacket(std::move(buffer), packetSizeWithHeader, sendingSockAddr);
PacketType::Value packetType = packet->getType(); PacketType::Value packetType = packet->getType();
@ -98,6 +101,7 @@ void IceServer::processDatagrams() {
} }
} }
} }
}
} }
SharedNetworkPeer IceServer::addOrUpdateHeartbeatingPeer(Packet& packet) { SharedNetworkPeer IceServer::addOrUpdateHeartbeatingPeer(Packet& packet) {