From 9a47e79e8e4e218e673f181ad601e508110f56c0 Mon Sep 17 00:00:00 2001 From: Derision Date: Sun, 3 Mar 2013 22:22:04 +0000 Subject: [PATCH] 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());