Merge pull request #894 from Winterleaf/Dev---Volume.cpp

Added Sanity Check for out of memory
This commit is contained in:
Thomas Fischer 2014-11-17 18:03:21 +01:00
commit e7a4d61772

View file

@ -944,12 +944,22 @@ bool ReadFile(const Path &inPath, void *&outData, U32 &outSize, bool inNullTermi
if ( inNullTerminate )
{
outData = new char [outSize+1];
if( !outData )
{
// out of memory
return false;
}
sizeRead = fileR->read(outData, outSize);
static_cast<char *>(outData)[outSize] = '\0';
}
else
{
outData = new char [outSize];
if( !outData )
{
// out of memory
return false;
}
sizeRead = fileR->read(outData, outSize);
}