From b0c1dd4790847364ebcab1cb1d4103500f64072e Mon Sep 17 00:00:00 2001 From: Baker Linden Date: Tue, 11 Mar 2014 16:19:49 -0700 Subject: - Added null checks in a couple places. --- indra/newview/llpanelgroupinvite.cpp | 5 +++++ indra/newview/llpanelgrouproles.cpp | 6 ++++++ 2 files changed, 11 insertions(+) (limited to 'indra/newview') diff --git a/indra/newview/llpanelgroupinvite.cpp b/indra/newview/llpanelgroupinvite.cpp index a368baee48..48736be253 100755 --- a/indra/newview/llpanelgroupinvite.cpp +++ b/indra/newview/llpanelgroupinvite.cpp @@ -184,6 +184,11 @@ void LLPanelGroupInvite::submit() std::map role_member_pairs; LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mImplementation->mGroupID); + if(!gdatap) + { + LL_WARNS("Groups") << "Unable to get group data for group " << mImplementation->mGroupID << LL_ENDL; + return; + } // Default to everyone role. LLUUID role_id = LLUUID::null; diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp index 06932a7ec5..b1ea8b7e57 100755 --- a/indra/newview/llpanelgrouproles.cpp +++ b/indra/newview/llpanelgrouproles.cpp @@ -1903,6 +1903,12 @@ bool LLPanelGroupRolesSubTab::needsApply(std::string& mesg) lldebugs << "LLPanelGroupRolesSubTab::needsApply()" << llendl; LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupID); + if(!gdatap) + { + llwarns << "Unable to get group data for group " << mGroupID << llendl; + return; + } + return (mHasRoleChange // Text changed in current role || (gdatap && gdatap->pendingRoleChanges())); // Pending role changes in the group -- cgit v1.2.3