Core/Networking: Fixed a crash caused by attempting to connect direct…

…ly to worldserver by setting portal=worldserver address Closes #16927
TrinityCore · Apr 9, 2016 · 174a614 · 174a614
1 parent 4c9d187
commit 174a614
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp
@@ -168,9 +168,21 @@ void WorldSocket::InitializeHandler(boost::system::error_code error, std::size_t
             ByteBuffer buffer(std::move(_packetBuffer));
 
             buffer >> magic;
+            if (magic != ConnectionInitializeMagic)
+            {
+                CloseSocket();
+                return;
+            }
+
             buffer >> length;
+            if (length > ClientConnectionInitialize.length())
+            {
+                CloseSocket();
+                return;
+            }
+
             std::string initializer = buffer.ReadString(length);
-            if (magic != ConnectionInitializeMagic || initializer != ClientConnectionInitialize)
+            if (initializer != ClientConnectionInitialize)
             {
                 CloseSocket();
                 return;