1 files changed, 4 insertions, 1 deletions
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index abcd2468e11..3b110b77723 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -2292,7 +2292,10 @@ namespace Trinity
                     va_end(ap);
                 }
                 else
-                    std::strcpy(strBuffer, text);
+                {
+                    std::strncpy(strBuffer, text, BufferSize);
+                    strBuffer[BufferSize - 1] = '\0';
+                }
 
                 do_helper(dataList, strBuffer);
             }