livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix potential crash in FSConsoleUtils::ProcessInstantMessage()

Ansariel 2016-10-20 19:49:40 +02:00
parent f6a7664366
commit f2e8e59745
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/fsconsoleutils.cpp
View File

@ -174,10 +174,16 @@ bool FSConsoleUtils::ProcessInstantMessage(const LLUUID& session_id, const LLUUI
}
LLIMModel::LLIMSession* session = LLIMModel::instance().findIMSession(session_id);
if (!session)
{
return false;
}
if (!fsLogGroupImToChatConsole && session->isGroupSessionType())
{
return false;
}
if (!fsLogImToChatConsole && !session->isGroupSessionType())
{
return false;
@ -190,13 +196,10 @@ bool FSConsoleUtils::ProcessInstantMessage(const LLUUID& session_id, const LLUUI
// Replacing the "IM" in front of group chat messages with the actual group name
std::string group;
if (session)
S32 groupNameLength = gSavedSettings.getS32("FSShowGroupNameLength");
if (groupNameLength != 0 && session->isGroupSessionType())
{
S32 groupNameLength = gSavedSettings.getS32("FSShowGroupNameLength");
if (groupNameLength != 0 && session->isGroupSessionType())
{
group = session->mName.substr(0, groupNameLength);
}
group = session->mName.substr(0, groupNameLength);
}
LLAvatarNameCache::get(from_id, boost::bind(&FSConsoleUtils::onProccessInstantMessageNameLookup, _1, _2, message, group, session_id));