Merge pull request #810 from ZappoMan/master

quick fix crash in parseVoxelStats()
This commit is contained in:
ZappoMan 2013-08-07 11:11:46 -07:00
commit 96e6c2f9bd

View file

@ -3962,6 +3962,9 @@ int Application::parseVoxelStats(unsigned char* messageData, ssize_t messageLeng
// But, also identify the sender, and keep track of the contained jurisdiction root for this server
Node* voxelServer = NodeList::getInstance()->nodeWithAddress(&senderAddress);
// quick fix for crash... why would voxelServer be NULL?
if (voxelServer) {
uint16_t nodeID = voxelServer->getNodeID();
VoxelPositionSize jurisditionDetails;
@ -3979,7 +3982,7 @@ int Application::parseVoxelStats(unsigned char* messageData, ssize_t messageLeng
}
// store jurisdiction details for later use
_voxelServerJurisdictions[nodeID] = jurisditionDetails;
}
return statsMessageLength;
}