ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Check for errors when reading lines from ini files.
This commit is contained in:
Pierre Bourdon 2014-05-28 11:57:00 +02:00
parent 3d21c6777e 0782d106db
commit ce139622f6
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/Common/IniFile.cpp
View File

@ -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