[CORE] Fix unsafe logic in FileSystem regarding closing and deleting files (#1303)

Author: xezon

Core/GameEngine/Include/Common/LocalFile.h

@@ -115,6 +115,10 @@ class LocalFile : public File
 		virtual char* readEntireAndClose();
 		virtual File* convertToRAMFile();
 
+	protected:
+
+		void closeWithoutDelete();
+		void closeFile();
 };
 
 

Core/GameEngine/Include/Common/RAMFile.h

@@ -111,6 +111,10 @@ class RAMFile : public File
 		*/
 		virtual char* readEntireAndClose();
 		virtual File* convertToRAMFile();
+
+	protected:
+
+		void closeFile();
 };
 
 

Core/GameEngine/Include/Common/file.h

@@ -122,6 +122,8 @@ class File : public MemoryPoolObject
 		File();											///< This class can only used as a base class
 		//virtual				~File();
 
+		void closeWithoutDelete();
+
 	public:
 
 

Core/GameEngine/Source/Common/System/File.cpp

@@ -122,7 +122,6 @@ File::File()
 
 File::~File()
 {
-	close();
 }
 
 //=================================================================
@@ -197,6 +196,17 @@ void File::close( void )
 	}
 }
 
+//=================================================================
+
+void File::closeWithoutDelete()
+{
+	if( m_open )
+	{
+		setName( "<no file>" );
+		m_open = FALSE;
+	}
+}
+
 //=================================================================
 // File::size 
 //=================================================================

Core/GameEngine/Source/Common/System/LocalFile.cpp

@@ -127,24 +127,7 @@ LocalFile::LocalFile()
 
 LocalFile::~LocalFile()
 {
-#if USE_BUFFERED_IO
-	if (m_file)
-	{
-		fclose(m_file);
-		m_file = NULL;
-		--s_totalOpen;
-	}
-#else
-	if( m_handle != -1 )
-	{
-		_close( m_handle );
-		m_handle = -1;
-		--s_totalOpen;
-	}
-#endif
-
-	File::close();
-
+	closeFile();
 }
 
 //=================================================================
@@ -278,7 +261,8 @@ Bool LocalFile::open( const Char *filename, Int access )
 
 error:
 
-	close();
+	// TheSuperHackers @fix Instance must never delete itself in this function.
+	closeWithoutDelete();
 
 	return FALSE;
 }
@@ -294,9 +278,39 @@ Bool LocalFile::open( const Char *filename, Int access )
 
 void LocalFile::close( void )
 {
+	closeFile();
 	File::close();
 }
 
+//=================================================================
+
+void LocalFile::closeWithoutDelete()
+{
+	closeFile();
+	File::closeWithoutDelete();
+}
+
+//=================================================================
+
+void LocalFile::closeFile()
+{
+#if USE_BUFFERED_IO
+	if (m_file)
+	{
+		fclose(m_file);
+		m_file = NULL;
+		--s_totalOpen;
+	}
+#else
+	if( m_handle != -1 )
+	{
+		_close( m_handle );
+		m_handle = -1;
+		--s_totalOpen;
+	}
+#endif
+}
+
 //=================================================================
 // LocalFile::read 
 //=================================================================
@@ -575,18 +589,12 @@ File* LocalFile::convertToRAMFile()
 		if (this->m_deleteOnClose)
 		{
 			ramFile->deleteOnClose();
-			this->close(); // is deleteonclose, so should delete.
-		}
-		else
-		{
-			this->close();
-			deleteInstance(this);
 		}
+		deleteInstance(this);
 		return ramFile;
 	}	
 	else 
 	{
-		ramFile->close();
 		deleteInstance(ramFile);
 		return this;
 	}

Core/GameEngine/Source/Common/System/RAMFile.cpp

@@ -126,12 +126,7 @@ RAMFile::RAMFile()
 
 RAMFile::~RAMFile()
 {
-	if (m_data != NULL) {
-		delete [] m_data;
-	}
-
-	File::close();
-
+	closeFile();
 }
 
 //=================================================================
@@ -247,15 +242,18 @@ Bool RAMFile::openFromArchive(File *archiveFile, const AsciiString& filename, In
 
 void RAMFile::close( void )
 {
-	if ( m_data )
-	{
-		delete [] m_data;
-		m_data = NULL;
-	}
-
+	closeFile();
 	File::close();
 }
 
+//=================================================================
+
+void RAMFile::closeFile()
+{
+	delete [] m_data;
+	m_data = NULL;
+}
+
 //=================================================================
 // RAMFile::read 
 //=================================================================

Core/GameEngine/Source/Common/System/StreamingArchiveFile.cpp

@@ -124,7 +124,6 @@ StreamingArchiveFile::StreamingArchiveFile()
 
 StreamingArchiveFile::~StreamingArchiveFile()
 {
-	File::close();
 }
 
 //=================================================================

Core/GameEngineDevice/Source/StdDevice/Common/StdLocalFileSystem.cpp

@@ -156,7 +156,6 @@ File * StdLocalFileSystem::openFile(const Char *filename, Int access /* = 0 */)
 	StdLocalFile *file = newInstance( StdLocalFile );
 
 	if (file->open(path.string().c_str(), access) == FALSE) {
-		file->close();
 		deleteInstance(file);
 		file = NULL;
 	} else {

Core/GameEngineDevice/Source/Win32Device/Common/Win32LocalFileSystem.cpp

@@ -72,7 +72,6 @@ File * Win32LocalFileSystem::openFile(const Char *filename, Int access /* = 0 */
 	Win32LocalFile *file = newInstance( Win32LocalFile );	
 
 	if (file->open(filename, access) == FALSE) {
-		file->close();
 		deleteInstance(file);
 		file = NULL;
 	} else {