From 698b66313c22a9d7dcab87e3784fa32c30801446 Mon Sep 17 00:00:00 2001 From: howard-stearns Date: Mon, 25 Jun 2018 14:49:33 -0700 Subject: [PATCH] guard startDynamicDomainVerification against missing entity --- assignment-client/src/entities/EntityServer.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/assignment-client/src/entities/EntityServer.cpp b/assignment-client/src/entities/EntityServer.cpp index 3ca8c1ecd1..8b86ba5eb2 100644 --- a/assignment-client/src/entities/EntityServer.cpp +++ b/assignment-client/src/entities/EntityServer.cpp @@ -504,6 +504,11 @@ void EntityServer::startDynamicDomainVerification() { QString thisDomainID = DependencyManager::get()->getDomainID().remove(QRegExp("\\{|\\}")); if (jsonObject["domain_id"].toString() != thisDomainID) { EntityItemPointer entity = tree->findEntityByEntityItemID(entityID); + if (!entity) { + qCDebug(entities) << "Entity undergoing dynamic domain verification is no longer available:" << entityID; + networkReply->deleteLater(); + return; + } if (entity->getAge() > (_MAXIMUM_DYNAMIC_DOMAIN_VERIFICATION_TIMER_MS/MSECS_PER_SECOND)) { qCDebug(entities) << "Entity's cert's domain ID" << jsonObject["domain_id"].toString() << "doesn't match the current Domain ID" << thisDomainID << "; deleting entity" << entityID;