aboutsummaryrefslogtreecommitdiff
path: root/src/server/collision/Maps/TileAssembler.cpp
diff options
context:
space:
mode:
authorSpp <spp@jorge.gr>2012-02-16 13:56:08 +0100
committerSpp <spp@jorge.gr>2012-02-16 13:56:28 +0100
commit03c34ee507b4e43fabee1ff382d9de9ea815e3f2 (patch)
tree08ffffcfeb954d98f1fa27d0a808746614bf3b47 /src/server/collision/Maps/TileAssembler.cpp
parente47ec04b4d58a4a080918aef57a35509ad69f0ca (diff)
Fix a lot of warnings
Diffstat (limited to 'src/server/collision/Maps/TileAssembler.cpp')
-rw-r--r--src/server/collision/Maps/TileAssembler.cpp9
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;