Fix potential crash on closing files when none are opened

Kingcom · Jul 9, 2017 · a86cd8e · a86cd8e
1 parent 8dec461
commit a86cd8e
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Commands/CDirectiveFile.cpp b/Commands/CDirectiveFile.cpp
@@ -51,8 +51,6 @@ void CDirectiveFile::initCopy(const std::wstring& inputName, const std::wstring&
 void CDirectiveFile::initClose()
 {
 	type = Type::Close;
-	closeFile = g_fileManager->getOpenFile();
-	g_fileManager->closeFile();
 	updateSection(++Global.Section);
 }
 
@@ -69,6 +67,7 @@ bool CDirectiveFile::Validate()
 		g_fileManager->openFile(file,true);
 		return false;
 	case Type::Close:
+		closeFile = g_fileManager->getOpenFile();
 		g_fileManager->closeFile();
 		return false;
 	}
@@ -125,7 +124,8 @@ void CDirectiveFile::writeSymData(SymbolData& symData) const
 		file->beginSymData();
 		break;
 	case Type::Close:
-		closeFile->endSymData();
+		if (closeFile)
+			closeFile->endSymData();
 		break;
 	}
 }