server/mangos
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Core] Fix resource leaks in DBCFileLoader. [cz2666]

Browse Source
This commit is contained in:
spp- 2015-07-08 22:14:41 +01:00 committed by Antz
parent 5dc51349ed
commit 889558650e
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/shared/DataStores/DBCFileLoader.cpp
View File

@ -40,7 +40,8 @@ bool DBCFileLoader::Load(const char* filename, const char* fmt)
delete[] data; delete[] data;
FILE* f = fopen(filename, "rb"); FILE* f = fopen(filename, "rb");
if (!f) { return false; } if (!f)
{ return false; }
if (fread(&header, 4, 1, f) != 1) // Number of records if (fread(&header, 4, 1, f) != 1) // Number of records
{ {
@ -49,6 +50,7 @@ bool DBCFileLoader::Load(const char* filename, const char* fmt)
} }
EndianConvert(header); EndianConvert(header);
if (header != 0x43424457) //'WDBC' if (header != 0x43424457) //'WDBC'
{ {
fclose(f); fclose(f);
@ -151,13 +153,13 @@ uint32 DBCFileLoader::GetFormatRecordSize(const char* format, int32* index_pos)
recordsize += sizeof(uint8); recordsize += sizeof(uint8);
break; break;
case DBC_FF_LOGIC: case DBC_FF_LOGIC:
assert(false && "DBC files not have logic field type"); assert(false && "Attempted to load DBC files that do not have field types that match what is in the core. Check DBCfmt.h or your DBC files.");
break; break;
case DBC_FF_NA: case DBC_FF_NA:
case DBC_FF_NA_BYTE: case DBC_FF_NA_BYTE:
break; break;
default: default:
assert(false && "unknown format character"); assert(false && "Unknown field format character in DBCfmt.h");
break; break;
} }
} }
@ -196,7 +198,8 @@ char* DBCFileLoader::AutoProduceData(const char* format, uint32& records, char**
for (uint32 y = 0; y < recordCount; ++y) for (uint32 y = 0; y < recordCount; ++y)
{ {
uint32 ind = getRecord(y).getUInt(i); uint32 ind = getRecord(y).getUInt(i);
if (ind > maxi) { maxi = ind; } if (ind > maxi)
{ maxi = ind; }
} }
++maxi; ++maxi;
@ -241,18 +244,18 @@ char* DBCFileLoader::AutoProduceData(const char* format, uint32& records, char**
offset += sizeof(uint8); offset += sizeof(uint8);
break; break;
case DBC_FF_STRING: case DBC_FF_STRING:
*((char**)(&dataTable[offset])) = NULL; // will be replaces non-empty or "" strings in AutoProduceStrings *((char**)(&dataTable[offset])) = NULL; // will replace non-empty or "" strings in AutoProduceStrings
offset += sizeof(char*); offset += sizeof(char*);
break; break;
case DBC_FF_LOGIC: case DBC_FF_LOGIC:
assert(false && "DBC files not have logic field type"); assert(false && "Attempted to load DBC files that do not have field types that match what is in the core. Check DBCfmt.h or your DBC files.");
break; break;
case DBC_FF_NA: case DBC_FF_NA:
case DBC_FF_NA_BYTE: case DBC_FF_NA_BYTE:
case DBC_FF_SORT: case DBC_FF_SORT:
break; break;
default: default:
assert(false && "unknown format character"); assert(false && "Unknown field format character in DBCfmt.h");
break; break;
} }
} }
@ -300,14 +303,14 @@ char* DBCFileLoader::AutoProduceStrings(const char* format, char* dataTable)
break; break;
} }
case DBC_FF_LOGIC: case DBC_FF_LOGIC:
assert(false && "DBC files not have logic field type"); assert(false && "Attempted to load DBC files that does not have field types that match what is in the core. Check DBCfmt.h or your DBC files.");
break; break;
case DBC_FF_NA: case DBC_FF_NA:
case DBC_FF_NA_BYTE: case DBC_FF_NA_BYTE:
case DBC_FF_SORT: case DBC_FF_SORT:
break; break;
default: default:
assert(false && "unknown format character"); assert(false && "Unknown field format character in DBCfmt.h");
break; break;
} }
} }

2
src/shared/DataStores/DBCFileLoader.h
View File

@ -180,7 +180,7 @@ class DBCFileLoader
* *
* @return bool * @return bool
*/ */
bool IsLoaded() {return (data != NULL);} bool IsLoaded() const {return (data != NULL);}
/** /**
* @brief * @brief
* *