Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

2 files changed, 3 insertions, 0 deletions

diff --git a/src/server/game/Scripting/ScriptLoader.cpp b/src/server/game/Scripting/ScriptLoader.cpp
index 5ba6d09553d..bdb11c6db0e 100644
--- a/src/server/game/Scripting/ScriptLoader.cpp
+++ b/src/server/game/Scripting/ScriptLoader.cpp
@@ -660,6 +660,7 @@ void AddSC_event_childrens_week();
 
 // Pets
 void AddSC_deathknight_pet_scripts();
+void AddSC_generic_pet_scripts();
 void AddSC_hunter_pet_scripts();
 void AddSC_mage_pet_scripts();
 void AddSC_priest_pet_scripts();
@@ -1379,6 +1380,7 @@ void AddPetScripts()
 {
 #ifdef SCRIPTS
     AddSC_deathknight_pet_scripts();
+    AddSC_generic_pet_scripts();
     AddSC_hunter_pet_scripts();
     AddSC_mage_pet_scripts();
     AddSC_priest_pet_scripts();
diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp
index 15cb32113dd..995e44a6037 100644
--- a/src/server/game/Server/WorldSocket.cpp
+++ b/src/server/game/Server/WorldSocket.cpp
@@ -524,6 +524,7 @@ int WorldSocket::handle_input_payload (void)
 
     m_RecvPct.base (NULL, 0);
     m_RecvPct.reset();
+    delete m_RecvWPct;
     m_RecvWPct = NULL;
 
     m_Header.reset();