Browse Source

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

Added Sanity Check for out of memory
Thomas Fischer 10 years ago
parent
commit
e7a4d61772
1 changed files with 10 additions and 0 deletions
  1. 10 0
      Engine/source/core/volume.cpp

+ 10 - 0
Engine/source/core/volume.cpp

@@ -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);
    }