summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2016-01-12 19:20:54 +0200
committerAndreyL ProductEngine <alihatskiy@productengine.com>2016-01-12 19:20:54 +0200
commitc9a81ae0792bd0b6fb60789177101880b81d7dde (patch)
treedfc4bbfb7dc73c43930105de23b08b06a71d035b /indra
parent86ee5d92fcacf2fd55706a987c224b83c28f326b (diff)
MAINT-6041 Crash in LLGroupMgr::processGroupPropertiesReply
Added a Null check
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llgroupmgr.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp
index e1315adfde..012a4fdb2f 100755
--- a/indra/newview/llgroupmgr.cpp
+++ b/indra/newview/llgroupmgr.cpp
@@ -1053,6 +1053,11 @@ void LLGroupMgr::processGroupMembersReply(LLMessageSystem* msg, void** data)
void LLGroupMgr::processGroupPropertiesReply(LLMessageSystem* msg, void** data)
{
LL_DEBUGS() << "LLGroupMgr::processGroupPropertiesReply" << LL_ENDL;
+ if (!msg)
+ {
+ LL_ERRS() << "Can't access the messaging system" << LL_ENDL;
+ return;
+ }
LLUUID agent_id;
msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id );
if (gAgent.getID() != agent_id)