mirror of
https://github.com/mod-playerbots/azerothcore-wotlk.git
synced 2026-01-22 13:16:23 +00:00
Core/Misc: Remove redundant null pointer checks before delete (#2679)
Co-authored-by: Ujp8LfXBJ6wCPR <github@lillecarl.com> Co-authored-by: Ujp8LfXBJ6wCPR <github@lillecarl.com>
This commit is contained in:
@@ -2320,9 +2320,12 @@ void Guild::DeleteMember(uint64 guid, bool isDisbanding, bool isKicked, bool can
|
||||
// Call script on remove before member is actually removed from guild (and database)
|
||||
sScriptMgr->OnGuildRemoveMember(this, player, isDisbanding, isKicked);
|
||||
|
||||
if (Member* member = GetMember(guid))
|
||||
delete member;
|
||||
m_members.erase(lowguid);
|
||||
auto memberItr = m_members.find(lowguid);
|
||||
if (memberItr != m_members.end())
|
||||
{
|
||||
delete memberItr->second;
|
||||
m_members.erase(memberItr);
|
||||
}
|
||||
|
||||
// If player not online data in data field will be loaded from guild tabs no need to update it !!
|
||||
if (player)
|
||||
|
||||
@@ -64,7 +64,7 @@ bool FileLoader::prepareLoadedData()
|
||||
|
||||
void FileLoader::free()
|
||||
{
|
||||
if (data) delete[] data;
|
||||
delete[] data;
|
||||
data = 0;
|
||||
data_size = 0;
|
||||
version = 0;
|
||||
|
||||
@@ -111,7 +111,7 @@ void MPQFile::seekRelative(int offset)
|
||||
|
||||
void MPQFile::close()
|
||||
{
|
||||
if (buffer) delete[] buffer;
|
||||
delete[] buffer;
|
||||
buffer = 0;
|
||||
eof = true;
|
||||
}
|
||||
|
||||
@@ -111,7 +111,7 @@ void MPQFile::seekRelative(int offset)
|
||||
|
||||
void MPQFile::close()
|
||||
{
|
||||
if (buffer) delete[] buffer;
|
||||
delete[] buffer;
|
||||
buffer = 0;
|
||||
eof = true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user