Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-25 03:12:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Battleground: Fix crash added in c28345e279

Browse Source 
Fix a double-delete crash added in c28345e279 caused by copy-constructor copying pointers across different Battleground instances.

Valgrind log:
 Invalid read of size 8
  at : Battleground::~Battleground() (Battleground.cpp:231)
  by : BattlegroundWS::~BattlegroundWS() (BattlegroundWS.cpp:74)
  by : BattlegroundWS::~BattlegroundWS() (BattlegroundWS.cpp:74)
  by : BattlegroundMgr::Update(unsigned int) (BattlegroundMgr.cpp:103)
  by : World::Update(unsigned int) (World.cpp:2067)
 Address 0x5675d140 is 0 bytes inside a block of size 24 free'd
  at : operator delete(void*) (vg_replace_malloc.c:509)
  by : ArenaTeamScore::~ArenaTeamScore() (ArenaScore.h:64)
  by : Battleground::~Battleground() (Battleground.cpp:231)
  by : BattlegroundWS::~BattlegroundWS() (BattlegroundWS.cpp:74)
  by : BattlegroundWS::~BattlegroundWS() (BattlegroundWS.cpp:74)
  by : BattlegroundMgr::Update(unsigned int) (BattlegroundMgr.cpp:103)
This commit is contained in:
jackpoz
2014-06-29 14:03:29 +02:00
parent f8720d5be0
commit ee4602db3d
3 changed files with 55 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/server/game/Battlegrounds/ArenaScore.h
View File

@@ -54,40 +54,4 @@ struct ArenaScore : public BattlegroundScore
uint8 TeamId; // TEAM_ALLIANCE or TEAM_HORDE
};
struct ArenaTeamScore
{
friend class Battleground;
protected:
ArenaTeamScore() : RatingChange(0), MatchmakerRating(0) { }
virtual ~ArenaTeamScore() { }
void Assign(int32 ratingChange, uint32 matchMakerRating, std::string const& teamName)
{
RatingChange = ratingChange;
MatchmakerRating = matchMakerRating;
TeamName = teamName;
}
void BuildRatingInfoBlock(WorldPacket& data)
{
uint32 ratingLost = std::abs(std::min(RatingChange, 0));
uint32 ratingWon = std::max(RatingChange, 0);
data << uint32(ratingLost);
data << uint32(ratingWon);
data << uint32(MatchmakerRating);
}
void BuildTeamInfoBlock(WorldPacket& data)
{
data << TeamName;
}
int32 RatingChange;
uint32 MatchmakerRating;
std::string TeamName;
};
#endif // TRINITY_ARENA_SCORE_H

23
src/server/game/Battlegrounds/Battleground.cpp
View File

@@ -170,10 +170,6 @@ Battleground::Battleground()
m_ArenaTeamMMR[TEAM_ALLIANCE] = 0;
m_ArenaTeamMMR[TEAM_HORDE] = 0;
// Iterate this way for consistency's sake - client expects it to be sent in this order
for (int8 i = WINNER_ALLIANCE; i >= WINNER_HORDE; --i)
_arenaTeamScores[i] = new ArenaTeamScore();
m_BgRaids[TEAM_ALLIANCE] = NULL;
m_BgRaids[TEAM_HORDE] = NULL;
@@ -225,10 +221,6 @@ Battleground::~Battleground()
for (BattlegroundScoreMap::const_iterator itr = PlayerScores.begin(); itr != PlayerScores.end(); ++itr)
delete itr->second;
// Iterate this way for consistency's sake - client expects it to be sent in this order
for (int8 i = WINNER_ALLIANCE; i >= WINNER_HORDE; --i)
delete _arenaTeamScores[i];
}
void Battleground::Update(uint32 diff)
@@ -795,8 +787,8 @@ void Battleground::EndBattleground(uint32 winner)
uint8 winnerId = GetWinner();
uint8 loserId = winnerId == WINNER_ALLIANCE ? uint8(WINNER_HORDE) : winnerId;
_arenaTeamScores[winnerId]->Assign(winnerChange, winnerMatchmakerRating + winnerMatchmakerChange, winnerArenaTeam->GetName());
_arenaTeamScores[loserId]->Assign(loserChange, loserMatchmakerRating + loserMatchmakerChange, loserArenaTeam->GetName());
_arenaTeamScores[winnerId].Assign(winnerChange, winnerMatchmakerRating + winnerMatchmakerChange, winnerArenaTeam->GetName());
_arenaTeamScores[loserId].Assign(loserChange, loserMatchmakerRating + loserMatchmakerChange, loserArenaTeam->GetName());
TC_LOG_DEBUG("bg.arena", "Arena match Type: %u for Team1Id: %u - Team2Id: %u ended. WinnerTeamId: %u. Winner rating: +%d, Loser rating: %d", m_ArenaType, m_ArenaTeamIds[TEAM_ALLIANCE], m_ArenaTeamIds[TEAM_HORDE], winnerArenaTeam->GetId(), winnerChange, loserChange);
if (sWorld->getBoolConfig(CONFIG_ARENA_LOG_EXTENDED_INFO))
@@ -811,8 +803,8 @@ void Battleground::EndBattleground(uint32 winner)
// Deduct 16 points from each teams arena-rating if there are no winners after 45+2 minutes
else
{
_arenaTeamScores[WINNER_ALLIANCE]->Assign(ARENA_TIMELIMIT_POINTS_LOSS, winnerMatchmakerRating + winnerMatchmakerChange, winnerArenaTeam->GetName());
_arenaTeamScores[WINNER_HORDE]->Assign(ARENA_TIMELIMIT_POINTS_LOSS, loserMatchmakerRating + loserMatchmakerChange, loserArenaTeam->GetName());
_arenaTeamScores[WINNER_ALLIANCE].Assign(ARENA_TIMELIMIT_POINTS_LOSS, winnerMatchmakerRating + winnerMatchmakerChange, winnerArenaTeam->GetName());
_arenaTeamScores[WINNER_HORDE].Assign(ARENA_TIMELIMIT_POINTS_LOSS, loserMatchmakerRating + loserMatchmakerChange, loserArenaTeam->GetName());
winnerArenaTeam->FinishGame(ARENA_TIMELIMIT_POINTS_LOSS);
loserArenaTeam->FinishGame(ARENA_TIMELIMIT_POINTS_LOSS);
@@ -1107,6 +1099,9 @@ void Battleground::Reset()
delete itr->second;
PlayerScores.clear();
for (int8 i = WINNER_ALLIANCE; i >= WINNER_HORDE; --i)
_arenaTeamScores[i].Reset();
ResetBGSubclass();
}
@@ -1368,10 +1363,10 @@ void Battleground::BuildPvPLogDataPacket(WorldPacket& data)
{
// it seems this must be according to BG_WINNER_A/H and _NOT_ TEAM_A/H
for (int8 i = WINNER_ALLIANCE; i >= WINNER_HORDE; --i)
_arenaTeamScores[i]->BuildRatingInfoBlock(data);
_arenaTeamScores[i].BuildRatingInfoBlock(data);
for (int8 i = WINNER_ALLIANCE; i >= WINNER_HORDE; --i)
_arenaTeamScores[i]->BuildTeamInfoBlock(data);
_arenaTeamScores[i].BuildTeamInfoBlock(data);
}
if (GetStatus() == STATUS_WAIT_LEAVE)

48
src/server/game/Battlegrounds/Battleground.h
View File

@@ -22,6 +22,7 @@
#include "Common.h"
#include "SharedDefines.h"
#include "DBCEnums.h"
#include "WorldPacket.h"
class Creature;
class GameObject;
@@ -32,7 +33,6 @@ class WorldObject;
class WorldPacket;
class BattlegroundMap;
struct ArenaTeamScore;
struct BattlegroundScore;
struct Position;
struct PvPDifficultyEntry;
@@ -611,7 +611,51 @@ class Battleground
uint32 m_ArenaTeamIds[BG_TEAMS_COUNT];
uint32 m_ArenaTeamMMR[BG_TEAMS_COUNT];
ArenaTeamScore* _arenaTeamScores[BG_TEAMS_COUNT];
struct ArenaTeamScore
{
friend class Battleground;
protected:
ArenaTeamScore() : RatingChange(0), MatchmakerRating(0) { }
virtual ~ArenaTeamScore() { }
void Assign(int32 ratingChange, uint32 matchMakerRating, std::string const& teamName)
{
RatingChange = ratingChange;
MatchmakerRating = matchMakerRating;
TeamName = teamName;
}
void BuildRatingInfoBlock(WorldPacket& data)
{
uint32 ratingLost = std::abs(std::min(RatingChange, 0));
uint32 ratingWon = std::max(RatingChange, 0);
data << uint32(ratingLost);
data << uint32(ratingWon);
data << uint32(MatchmakerRating);
}
void BuildTeamInfoBlock(WorldPacket& data)
{
data << TeamName;
}
void Reset()
{
RatingChange = 0;
MatchmakerRating = 0;
TeamName.clear();
}
int32 RatingChange;
uint32 MatchmakerRating;
std::string TeamName;
};
ArenaTeamScore _arenaTeamScores[BG_TEAMS_COUNT];
// Limits
uint32 m_LevelMin;