Merge pull request #392 from RachelBryk/error-check-ini-file

Check for errors when reading lines from ini files.
dolphin-emu · May 28, 2014 · ce13962 · ce13962
2 parents 3d21c67 + 0782d10
commit ce13962
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/Source/Core/Common/IniFile.cpp b/Source/Core/Common/IniFile.cpp
@@ -345,8 +345,11 @@ bool IniFile::Load(const std::string& filename, bool keep_current_data)
 	while (!in.eof())
 	{
 		char templine[MAX_BYTES];
-		in.getline(templine, MAX_BYTES);
-		std::string line = templine;
+		std::string line;
+		if (in.getline(templine, MAX_BYTES))
+			line = templine;
+		else
+			return false;
 
 #ifndef _WIN32
 		// Check for CRLF eol and convert it to LF