diff --git a/src/game/WorldSession.cpp b/src/game/WorldSession.cpp
index 8f2a00821..a2c9ad097 100644
--- a/src/game/WorldSession.cpp
+++ b/src/game/WorldSession.cpp
@@ -613,6 +613,8 @@ void WorldSession::ReadMovementInfo(WorldPacket &data, MovementInfo *mi)
 
 void WorldSession::ReadAddonsInfo(WorldPacket &data)
 {
+    if (data.rpos() + 4 > data.size())
+        return;
     uint32 size;
     data >> size;