piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add a hacky check for text file size in ReadFileToString. Fixes issue 6455.

Browse Source
This commit is contained in:
Pierre Bourdon
2013-09-16 06:56:49 +02:00
parent a7e1fb81b1
commit f0fc611f15
2 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Source/Core/Common/Src/FileUtil.cpp
View File

@ -885,8 +885,34 @@ bool ReadFileToString(bool text_file, const char *filename, std::string &str)
if (!f)
return false;
size_t read_size;
str.resize(GetSize(f));
return file.ReadArray(&str[0], str.size());
bool retval = file.ReadArray(&str[0], str.size(), &read_size);
// On Windows, reading a text file automatically translates \r\n to \n.
// This means we will read less characters than the expected size of the
// file. In that case, ignore the return value and count ourselves.
#ifdef _WIN32
if (text_file)
{
size_t count = 0;
for (size_t i = 0; i < read_size; ++i)
{
if (str[i] == '\n')
count += 2;
else
count += 1;
}
if (count != str.size())
return false;
str.resize(read_size);
return true;
}
#endif
return retval;
}
IOFile::IOFile()