Core/DBLayer: Fixed memory leaks with existing SQLQueryHolder uses and eliminated the possibilty of adding more in future (replaced manual memory management with smart pointers)
This commit is contained in:
1 parent
3d29ffeb1a
commit
d6aa5e333e
11 files changed
+80
-99
No files matched your search
@@ -764,19 +764,18 @@ void WorldSession::HandleContinuePlayerLogin()
|
||||
return;
|
||||
}
|
||||
|
||||
LoginQueryHolder* holder = new LoginQueryHolder(GetAccountId(), m_playerLoading);
|
||||
std::shared_ptr<LoginQueryHolder> holder = std::make_shared<LoginQueryHolder>(GetAccountId(), m_playerLoading);
|
||||
if (!holder->Initialize())
|
||||
{
|
||||
delete holder; // delete all unprocessed queries
|
||||
m_playerLoading.Clear();
|
||||
return;
|
||||
}
|
||||
|
||||
SendPacket(WorldPackets::Auth::ResumeComms(CONNECTION_TYPE_INSTANCE).Write());
|
||||
|
||||
AddQueryHolderCallback(CharacterDatabase.DelayQueryHolder(holder)).AfterComplete([this](SQLQueryHolderBase* holder)
|
||||
AddQueryHolderCallback(CharacterDatabase.DelayQueryHolder(holder)).AfterComplete([this](SQLQueryHolderBase const& holder)
|
||||
{
|
||||
HandlePlayerLogin(static_cast<LoginQueryHolder*>(holder));
|
||||
HandlePlayerLogin(static_cast<LoginQueryHolder const&>(holder));
|
||||
});
|
||||
}
|
||||
|
||||
@@ -803,9 +802,9 @@ void WorldSession::HandleLoadScreenOpcode(WorldPacket& recvPacket)
|
||||
// TODO: Do something with this packet
|
||||
}
|
||||
|
||||
void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder)
|
||||
void WorldSession::HandlePlayerLogin(LoginQueryHolder const& holder)
|
||||
{
|
||||
ObjectGuid playerGuid = holder->GetGuid();
|
||||
ObjectGuid playerGuid = holder.GetGuid();
|
||||
|
||||
Player* pCurrChar = new Player(this);
|
||||
// for send server info and strings (config)
|
||||
@@ -817,7 +816,6 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder)
|
||||
SetPlayer(nullptr);
|
||||
KickPlayer(); // disconnect client, player no set to session and it will not deleted or saved at kick
|
||||
delete pCurrChar; // delete it manually
|
||||
delete holder; // delete all unprocessed queries
|
||||
m_playerLoading.Clear();
|
||||
return;
|
||||
}
|
||||
@@ -831,7 +829,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder)
|
||||
SendPacket(loginVerifyWorld.Write());
|
||||
|
||||
// load player specific part before send times
|
||||
LoadAccountData(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_ACCOUNT_DATA), PER_CHARACTER_CACHE_MASK);
|
||||
LoadAccountData(holder.GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_ACCOUNT_DATA), PER_CHARACTER_CACHE_MASK);
|
||||
SendAccountDataTimes(PER_CHARACTER_CACHE_MASK);
|
||||
|
||||
WorldPackets::System::FeatureSystemStatus features;
|
||||
@@ -865,7 +863,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder)
|
||||
chH.PSendSysMessage(GitRevision::GetFullVersion());
|
||||
|
||||
//QueryResult* result = CharacterDatabase.PQuery("SELECT guildid, rank FROM guild_member WHERE guid = '%u'", pCurrChar->GetGUID().GetCounter());
|
||||
if (PreparedQueryResult resultGuild = holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_GUILD))
|
||||
if (PreparedQueryResult resultGuild = holder.GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_GUILD))
|
||||
{
|
||||
Field* fields = resultGuild->Fetch();
|
||||
pCurrChar->SetInGuild(fields[0].GetUInt32());
|
||||
@@ -986,7 +984,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder)
|
||||
sSocialMgr->SendFriendStatus(pCurrChar, FRIEND_ONLINE, pCurrChar->GetGUID(), true);
|
||||
|
||||
// Place character in world (and load zone) before some object loading
|
||||
pCurrChar->LoadCorpse(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_CORPSE_LOCATION));
|
||||
pCurrChar->LoadCorpse(holder.GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_CORPSE_LOCATION));
|
||||
|
||||
// setting Ghost+speed if dead
|
||||
if (pCurrChar->m_deathState == DEAD)
|
||||
@@ -998,7 +996,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder)
|
||||
if (pCurrChar->HasAtLoginFlag(AT_LOGIN_RESET_PET_TALENTS))
|
||||
Pet::resetTalentsForAllPetsOf(pCurrChar);
|
||||
|
||||
pCurrChar->LoadPetsFromDB(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_ALL_PETS));
|
||||
pCurrChar->LoadPetsFromDB(holder.GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_ALL_PETS));
|
||||
|
||||
// Load pet if any (if player not alive and in taxi flight or another then pet will remember as temporary unsummoned)
|
||||
pCurrChar->LoadPet();
|
||||
@@ -1149,8 +1147,6 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder)
|
||||
TC_METRIC_EVENT("player_events", "Login", pCurrChar->GetName());
|
||||
|
||||
sBattlenetServer.SendChangeToonOnlineState(GetBattlenetAccountId(), GetAccountId(), _player->GetGUID(), _player->GetName(), true);
|
||||
|
||||
delete holder;
|
||||
}
|
||||
|
||||
void WorldSession::HandleSetFactionAtWar(WorldPacket& recvData)
|
||||
|
||||
Reference in new issue
Block a user