Merge branch 'master' of git://github.com/TrinityCore/TrinityCore

1 files changed, 4 insertions, 5 deletions

diff --git a/src/server/collision/Maps/TileAssembler.cpp b/src/server/collision/Maps/TileAssembler.cpp
index 62968e4dedd..cfd50c318df 100644
--- a/src/server/collision/Maps/TileAssembler.cpp
+++ b/src/server/collision/Maps/TileAssembler.cpp
@@ -344,16 +344,15 @@ namespace VMAP
         char buff[500];
         while (!feof(model_list))
         {
-            fread(&displayId,sizeof(uint32),1,model_list);
-            fread(&name_length,sizeof(uint32),1,model_list);
-
-            if (name_length >= sizeof(buff))
+            if (fread(&displayId, sizeof(uint32), 1, model_list) != 1
+                || fread(&name_length, sizeof(uint32), 1, model_list) != 1
+                || name_length >= sizeof(buff)
+                || fread(&buff, sizeof(char), name_length, model_list) != name_length)
             {
                 std::cout << "\nFile 'temp_gameobject_models' seems to be corrupted" << std::endl;
                 break;
             }
 
-            fread(&buff,sizeof(char),name_length,model_list);
             std::string model_name(buff, name_length);
 
             WorldModel_Raw raw_model;