Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: Memory leaks in CBigFile

Browse source
This commit is contained in:
kervala 2016-12-04 16:54:57 +01:00
parent e9328811af
commit ec0222958f
2 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/nel/include/nel/misc/big_file.h
View file

@ -112,7 +112,8 @@ public:
// A BNP structure // A BNP structure
struct BNP struct BNP
{ {
BNP() : FileNames(NULL), ThreadFileId(0), CacheFileOnOpen(false), AlwaysOpened(false), InternalUse(false), OffsetFromBeginning(0) { } BNP();
~BNP();
// FileName of the BNP. important to open it in getFile() (for other threads or if not always opened). // FileName of the BNP. important to open it in getFile() (for other threads or if not always opened).
std::string BigFileName; std::string BigFileName;
@ -163,6 +164,7 @@ private:
{ {
public: public:
CThreadFileArray(); CThreadFileArray();
~CThreadFileArray();
// Allocate a FileId for a BNP. // Allocate a FileId for a BNP.
uint32 allocate(); uint32 allocate();

25
code/nel/src/misc/big_file.cpp
View file

@ -45,8 +45,16 @@ void CBigFile::releaseInstance()
// *************************************************************************** // ***************************************************************************
CBigFile::CThreadFileArray::CThreadFileArray() CBigFile::CThreadFileArray::CThreadFileArray()
{ {
_CurrentId= 0; _CurrentId = 0;
} }
// ***************************************************************************
CBigFile::CThreadFileArray::~CThreadFileArray()
{
vector<CHandleFile> *ptr = (vector<CHandleFile>*)_TDS.getPointer();
if (ptr) delete ptr;
}
// *************************************************************************** // ***************************************************************************
uint32 CBigFile::CThreadFileArray::allocate() uint32 CBigFile::CThreadFileArray::allocate()
{ {
@ -186,11 +194,24 @@ void CBigFile::remove (const std::string &sBigFileName)
fclose (handle.File); fclose (handle.File);
handle.File= NULL; handle.File= NULL;
} }
delete [] rbnp.FileNames;
_BNPs.erase (it); _BNPs.erase (it);
} }
} }
CBigFile::BNP::BNP() : FileNames(NULL), ThreadFileId(0), CacheFileOnOpen(false), AlwaysOpened(false), InternalUse(false), OffsetFromBeginning(0)
{
}
CBigFile::BNP::~BNP()
{
if (FileNames)
{
delete[] FileNames;
FileNames = NULL;
}
}
//// *************************************************************************** //// ***************************************************************************
bool CBigFile::BNP::readHeader() bool CBigFile::BNP::readHeader()
{ {