Core/Misc: Remove redundant null pointer checks before delete (#24140)

* Identified by clang-tidy readability-delete-null-pointer
This commit is contained in:
Ujp8LfXBJ6wCPR
2020-02-14 12:45:34 +01:00
committed by GitHub
parent b92e4af460
commit 9264e5b6f0
4 changed files with 9 additions and 6 deletions

View File

@@ -2400,9 +2400,12 @@ void Guild::DeleteMember(SQLTransaction& trans, ObjectGuid guid, bool isDisbandi
// 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(guid);
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)

View File

@@ -75,7 +75,7 @@ bool FileLoader::prepareLoadedData()
void FileLoader::free()
{
if (data) delete[] data;
delete[] data;
data = 0;
data_size = 0;
version = 0;

View File

@@ -122,7 +122,7 @@ void MPQFile::seekRelative(int offset)
void MPQFile::close()
{
if (buffer) delete[] buffer;
delete[] buffer;
buffer = 0;
eof = true;
}

View File

@@ -128,7 +128,7 @@ void MPQFile::seekRelative(int offset)
void MPQFile::close()
{
if (buffer) delete[] buffer;
delete[] buffer;
buffer = 0;
eof = true;
}