mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-20 16:37:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[7421] Check fread result at DBC file loading.

Browse source 
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"
This commit is contained in:
VladimirMangos 2009-03-09 10:11:20 +03:00
parent 8bb451c85c
commit 60a3366892
2 changed files with 25 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/shared/Database/dbcfile.cpp
View file

@ -37,23 +37,35 @@ bool DBCFile::Load(const char *filename, const char *fmt)
delete [] data; delete [] data;
data=NULL; data=NULL;
} }
FILE * f=fopen(filename,"rb"); FILE * f=fopen(filename,"rb");
if(!f)return false; 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); EndianConvert(header);
if(header!=0x43424457) if(header!=0x43424457)
{
//printf("not dbc file");
return false; //'WDBC' 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); EndianConvert(recordCount);
fread(&fieldCount,4,1,f); // Number of fields
if(fread(&fieldCount,4,1,f)!=1) // Number of fields
return false;
EndianConvert(fieldCount); 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); EndianConvert(recordSize);
fread(&stringSize,4,1,f); // String size
if(fread(&stringSize,4,1,f)!=1) // String size
return false;
EndianConvert(stringSize); EndianConvert(stringSize);
fieldsOffset = new uint32[fieldCount]; fieldsOffset = new uint32[fieldCount];
@ -69,7 +81,10 @@ bool DBCFile::Load(const char *filename, const char *fmt)
data = new unsigned char[recordSize*recordCount+stringSize]; data = new unsigned char[recordSize*recordCount+stringSize];
stringTable = data + recordSize*recordCount; stringTable = data + recordSize*recordCount;
fread(data,recordSize*recordCount+stringSize,1,f);
if(fread(data,recordSize*recordCount+stringSize,1,f)!=1)
return false;
fclose(f); fclose(f);
return true; return true;
} }

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "7420" #define REVISION_NR "7421"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__