TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 23:54:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Added Sanity Check for out of memory
This commit is contained in:
Thomas Fischer 2014-11-17 18:03:21 +01:00
commit e7a4d61772
1 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Engine/source/core/volume.cpp
View file

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