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

Conflicts:
	src/server/scripts/Kalimdor/moonglade.cpp

1 files changed, 4 insertions, 8 deletions

diff --git a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
index 78ffddca4d8..1230b7e88cf 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
@@ -166,16 +166,12 @@ class instance_the_eye : public InstanceMapScript
             std::string GetSaveData()
             {
                 OUT_SAVE_INST_DATA;
+
                 std::ostringstream stream;
                 stream << m_auiEncounter[0] << ' ' << m_auiEncounter[1] << ' ' << m_auiEncounter[2] << ' ' << m_auiEncounter[3];
-                char* out = new char[stream.str().length() + 1];
-                strcpy(out, stream.str().c_str());
-                if (out)
-                {
-                    OUT_SAVE_INST_DATA_COMPLETE;
-                    return out;
-                }
-                return NULL;
+
+                OUT_SAVE_INST_DATA_COMPLETE;
+                return stream.str();
             }
 
             void Load(const char* in)