From aceaba0fb0b3321b237e6ba4e0320cb5802762c1 Mon Sep 17 00:00:00 2001 From: Derision Date: Sun, 3 Mar 2013 22:12:14 +0000 Subject: [PATCH 1/3] Fixed uninitialised mercOwner highlighted by cppcheck. --- zone/merc.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/zone/merc.cpp b/zone/merc.cpp index 3dd9f8e3e..01a4ff1b4 100644 --- a/zone/merc.cpp +++ b/zone/merc.cpp @@ -5165,12 +5165,9 @@ bool Merc::Unsuspend(bool setMaxStats) { return true; } -bool Merc::Dismiss() { - Client* mercOwner; +bool Merc::Dismiss(){ - if(GetMercOwner()) { - mercOwner = GetMercOwner(); - } + Client* mercOwner = GetMercOwner(); if(!mercOwner) return false; From 9a47e79e8e4e218e673f181ad601e508110f56c0 Mon Sep 17 00:00:00 2001 From: Derision Date: Sun, 3 Mar 2013 22:22:04 +0000 Subject: [PATCH 2/3] Fixed memleak in Client::Handle_OP_MercenaryDataRequest (cppcheck) --- zone/client_packet.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp index 07771f1e7..49e12374d 100644 --- a/zone/client_packet.cpp +++ b/zone/client_packet.cpp @@ -13503,19 +13503,20 @@ void Client::Handle_OP_MercenaryDataRequest(const EQApplicationPacket *app) } NPC* tar = entity_list.GetNPCByID(merchant_id); - if(tar) { + + if(tar) { int mercTypeCount = 0; int mercCount = 0; + if(DistNoRoot(*tar) > USE_NPC_RANGE2) + return; + + if(tar->GetClass() != MERCERNARY_MASTER) { + return; + } + MercenaryMerchantList_Struct* mml = new MercenaryMerchantList_Struct; - if(DistNoRoot(*tar) > USE_NPC_RANGE2) - return; - - if(tar->GetClass() != MERCERNARY_MASTER) { - return; - } - mercTypeCount = tar->GetNumMercTypes(GetClientVersion()); mercCount = tar->GetNumMercs(GetClientVersion()); From af1f87a00f27a6f2fc65396b62dd323748d877aa Mon Sep 17 00:00:00 2001 From: Derision Date: Sun, 3 Mar 2013 22:26:57 +0000 Subject: [PATCH 3/3] Fixed uninitialised variabled tempBot in #bot stance command (cppcheck) --- zone/bot.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zone/bot.cpp b/zone/bot.cpp index 48f9fc9a1..17bdc2cae 100644 --- a/zone/bot.cpp +++ b/zone/bot.cpp @@ -15372,7 +15372,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) { if(!strcasecmp(sep->arg[1], "stance")) { if(sep->argnum == 3){ - Bot* tempBot; + Bot* tempBot = NULL; std::string botName = std::string(sep->arg[2]); if(!botName.empty())