From 209f24d7e09785878abd8e3b94be4e2dff07b0f7 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Mon, 9 Mar 2009 17:46:50 -0600
Subject:     [7421] Check fread result at DBC file loading. Author:
 VladimirMangos

    This is more safe in general and prevent "warning: ignoring return value of 'size_t fread(void*, size_t, size_t, FILE*)', declared with attribute warn_unused_result"

--HG--
branch : trunk
---
 src/shared/Database/dbcfile.cpp | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

(limited to 'src/shared/Database/dbcfile.cpp')

diff --git a/src/shared/Database/dbcfile.cpp b/src/shared/Database/dbcfile.cpp
index c40c8b223e1..1de121bb17d 100644
--- a/src/shared/Database/dbcfile.cpp
+++ b/src/shared/Database/dbcfile.cpp
@@ -39,23 +39,35 @@ bool DBCFile::Load(const char *filename, const char *fmt)
         delete [] data;
         data=NULL;
     }
+
     FILE * f=fopen(filename,"rb");
     if(!f)return false;
 
-    fread(&header,4,1,f);                                   // Number of records
+    if(fread(&header,4,1,f)!=1)                             // Number of records
+        return false;
+
     EndianConvert(header);
     if(header!=0x43424457)
-    {
-        //printf("not dbc file");
         return false;                                       //'WDBC'
-    }
-    fread(&recordCount,4,1,f);                              // Number of records
+
+    if(fread(&recordCount,4,1,f)!=1)                        // Number of records
+        return false;
+
     EndianConvert(recordCount);
-    fread(&fieldCount,4,1,f);                               // Number of fields
+
+    if(fread(&fieldCount,4,1,f)!=1)                         // Number of fields
+        return false;
+
     EndianConvert(fieldCount);
-    fread(&recordSize,4,1,f);                               // Size of a record
+
+    if(fread(&recordSize,4,1,f)!=1)                         // Size of a record
+        return false;
+
     EndianConvert(recordSize);
-    fread(&stringSize,4,1,f);                               // String size
+
+    if(fread(&stringSize,4,1,f)!=1)                         // String size
+        return false;
+
     EndianConvert(stringSize);
 
     fieldsOffset = new uint32[fieldCount];
@@ -71,7 +83,10 @@ bool DBCFile::Load(const char *filename, const char *fmt)
 
     data = new unsigned char[recordSize*recordCount+stringSize];
     stringTable = data + recordSize*recordCount;
-    fread(data,recordSize*recordCount+stringSize,1,f);
+
+    if(fread(data,recordSize*recordCount+stringSize,1,f)!=1)
+        return false;
+
     fclose(f);
     return true;
 }
-- 
cgit v1.2.3