Fixed a couple of memory leaks.

This commit is contained in:
Derision 2013-03-18 21:09:23 +00:00
parent d036afee5b
commit 5c9f2c0d50
2 changed files with 5 additions and 3 deletions

View File

@ -2310,7 +2310,10 @@ bool Merc::AICastSpell(int8 iChance, int32 iSpellTypes) {
//we don't need spam of bots healing themselves //we don't need spam of bots healing themselves
MakeAnyLenString(&gmsg, "Casting %s on %s.", spells[selectedMercSpell.spellid].name, tar->GetCleanName()); MakeAnyLenString(&gmsg, "Casting %s on %s.", spells[selectedMercSpell.spellid].name, tar->GetCleanName());
if(gmsg) if(gmsg)
{
MercGroupSay(this, gmsg); MercGroupSay(this, gmsg);
safe_delete_array(gmsg);
}
} }
} }

View File

@ -1884,15 +1884,14 @@ void ZoneDatabase::LoadMercBuffs(Merc *merc) {
BuffsLoaded = true; BuffsLoaded = true;
} }
safe_delete(Query); safe_delete_array(Query);
Query = 0; Query = 0;
if(errorMessage.empty() && BuffsLoaded) { if(errorMessage.empty() && BuffsLoaded) {
if(!database.RunQuery(Query, MakeAnyLenString(&Query, "DELETE FROM merc_buffs WHERE MercId = %u", merc->GetMercID()), TempErrorMessageBuffer)) { if(!database.RunQuery(Query, MakeAnyLenString(&Query, "DELETE FROM merc_buffs WHERE MercId = %u", merc->GetMercID()), TempErrorMessageBuffer)) {
errorMessage = std::string(TempErrorMessageBuffer); errorMessage = std::string(TempErrorMessageBuffer);
safe_delete(Query);
Query = 0;
} }
safe_delete_array(Query);
} }
if(!errorMessage.empty()) { if(!errorMessage.empty()) {