mirror of
https://github.com/lubosz/overte.git
synced 2025-08-07 17:01:06 +02:00
Merge pull request #5128 from sethalves/unreasonably-deep-recursion
unreasonably deep recursion
This commit is contained in:
commit
03409fa7d8
1 changed files with 5 additions and 2 deletions
|
@ -392,17 +392,20 @@ OctreeElement::AppendState EntityTreeElement::appendElementData(OctreePacketData
|
||||||
|
|
||||||
// If we wrote fewer entities than we expected, update the number of entities in our packet
|
// If we wrote fewer entities than we expected, update the number of entities in our packet
|
||||||
bool successUpdateEntityCount = true;
|
bool successUpdateEntityCount = true;
|
||||||
if (!noEntitiesFit && numberOfEntities != actualNumberOfEntities) {
|
if (numberOfEntities != actualNumberOfEntities) {
|
||||||
successUpdateEntityCount = packetData->updatePriorBytes(numberOfEntitiesOffset,
|
successUpdateEntityCount = packetData->updatePriorBytes(numberOfEntitiesOffset,
|
||||||
(const unsigned char*)&actualNumberOfEntities, sizeof(actualNumberOfEntities));
|
(const unsigned char*)&actualNumberOfEntities, sizeof(actualNumberOfEntities));
|
||||||
}
|
}
|
||||||
|
|
||||||
// If we weren't able to update our entity count, or we couldn't fit any entities, then
|
// If we weren't able to update our entity count, or we couldn't fit any entities, then
|
||||||
// we should discard our element and return a result of NONE
|
// we should discard our element and return a result of NONE
|
||||||
if (!successUpdateEntityCount || noEntitiesFit) {
|
if (!successUpdateEntityCount) {
|
||||||
packetData->discardLevel(elementLevel);
|
packetData->discardLevel(elementLevel);
|
||||||
appendElementState = OctreeElement::NONE;
|
appendElementState = OctreeElement::NONE;
|
||||||
} else {
|
} else {
|
||||||
|
if (noEntitiesFit) {
|
||||||
|
appendElementState = OctreeElement::PARTIAL;
|
||||||
|
}
|
||||||
packetData->endLevel(elementLevel);
|
packetData->endLevel(elementLevel);
|
||||||
}
|
}
|
||||||
return appendElementState;
|
return appendElementState;
|
||||||
|
|
Loading…
Reference in a new issue