josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Groups: Add some checks to prevent a crash with Invites

Browse Source 
Core/Groups: Use proper size with SMSG_GROUP_DECLINE Opcode

Fixes issue 4412. (Prevents the crash but the main reason of player being null not solved)

--HG--
branch : trunk
This commit is contained in:
Spp
2010-10-29 14:09:25 +02:00
parent 7b35d0b2e8
commit c9b6f44e9f
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Groups/Group.cpp
+9 -6
View File
@@ -270,16 +270,19 @@ bool Group::AddLeaderInvite(Player *player)
uint32 Group::RemoveInvite(Player *player)
{
m_invitees.erase(player);
player->SetGroupInvite(NULL);
if (player)
{
m_invitees.erase(player);
player->SetGroupInvite(NULL);
}
return GetMembersCount();
}
void Group::RemoveAllInvites()
{
for (InvitesList::iterator itr=m_invitees.begin(); itr != m_invitees.end(); ++itr)
(*itr)->SetGroupInvite(NULL);
if (*itr)
(*itr)->SetGroupInvite(NULL);
m_invitees.clear();
}
@@ -288,7 +291,7 @@ Player* Group::GetInvited(const uint64& guid) const
{
for (InvitesList::const_iterator itr = m_invitees.begin(); itr != m_invitees.end(); ++itr)
{
if ((*itr)->GetGUID() == guid)
if ((*itr) && (*itr)->GetGUID() == guid)
return (*itr);
}
return NULL;
@@ -298,7 +301,7 @@ Player* Group::GetInvited(const std::string& name) const
{
for (InvitesList::const_iterator itr = m_invitees.begin(); itr != m_invitees.end(); ++itr)
{
if ((*itr)->GetName() == name)
if ((*itr) && (*itr)->GetName() == name)
return (*itr);
}
return NULL;
src/server/game/Server/Protocol/Handlers/GroupHandler.cpp
+5 -5
View File
@@ -236,18 +236,18 @@ void WorldSession::HandleGroupDeclineOpcode(WorldPacket & /*recv_data*/)
Group *group = GetPlayer()->GetGroupInvite();
if (!group) return;
// remember leader if online
Player *leader = sObjectMgr.GetPlayer(group->GetLeaderGUID());
// uninvite, group can be deleted
GetPlayer()->UninviteFromGroup();
// remember leader if online
Player *leader = sObjectMgr.GetPlayer(group->GetLeaderGUID());
if (!leader || !leader->GetSession())
return;
// report
WorldPacket data(SMSG_GROUP_DECLINE, 10); // guess size
data << GetPlayer()->GetName();
std::string name = std::string(GetPlayer()->GetName());
WorldPacket data(SMSG_GROUP_DECLINE, name.length());
data << name.c_str();
leader->GetSession()->SendPacket(&data);
}