From 6dda09818d32fc715549cda3e8bd6fa806425b27 Mon Sep 17 00:00:00 2001
From: jackpoz <giacomopoz@gmail.com>
Date: Sun, 26 Nov 2017 11:52:45 +0100
Subject: Core/Quests: Fix memory leak in Quest Greeting

---
 src/server/game/Globals/ObjectMgr.cpp | 4 ++--
 src/server/game/Globals/ObjectMgr.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 7a872d2614a..7e58bbec264 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -5992,7 +5992,7 @@ QuestGreeting const* ObjectMgr::GetQuestGreeting(ObjectGuid guid) const
     if (questItr == itr->second.end())
         return nullptr;
 
-    return questItr->second;
+    return &questItr->second;
 }
 
 void ObjectMgr::LoadQuestGreetings()
@@ -6054,7 +6054,7 @@ void ObjectMgr::LoadQuestGreetings()
         uint32 greetEmoteDelay      = fields[3].GetUInt32();
         std::string greeting        = fields[4].GetString();
 
-        _questGreetingStore[type][id] = new QuestGreeting(greetEmoteType, greetEmoteDelay, greeting);
+        _questGreetingStore[type][id] = QuestGreeting(greetEmoteType, greetEmoteDelay, greeting);
 
         ++count;
     }
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h
index 8a07723a34e..80d120a13ea 100644
--- a/src/server/game/Globals/ObjectMgr.h
+++ b/src/server/game/Globals/ObjectMgr.h
@@ -811,7 +811,7 @@ struct QuestGreeting
         : greetEmoteType(_greetEmoteType), greetEmoteDelay(_greetEmoteDelay), greeting(_greeting) { }
 };
 
-typedef std::unordered_map<uint8, std::unordered_map<uint32, QuestGreeting const*>> QuestGreetingContainer;
+typedef std::unordered_map<uint8, std::unordered_map<uint32, QuestGreeting>> QuestGreetingContainer;
 
 struct GraveyardData
 {
-- 
cgit v1.2.3