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

Try to fix File::Copy with non-1024-byte aligned sizes 

ifstream::read() sets the failbit if trying to read over the end, which
means that (!input) would be hit for the 'last' block if it wasn't
exactly BSIZE (1024) bytes.
This commit is contained in:
Jonathan Hamilton 2017-08-17 09:13:16 -07:00
parent 4e40fad248
commit 643b3ba9f8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Common/FileUtil.cpp
View File

@ -354,7 +354,7 @@ bool Copy(const std::string& srcFilename, const std::string& destFilename)
while (!input.eof())
{
// read input
input.read(buffer, BSIZE);
auto read_size = input.readsome(buffer, BSIZE);
if (!input)
{
ERROR_LOG(COMMON, "Copy: failed reading from source, %s --> %s: %s", srcFilename.c_str(),
@ -363,7 +363,7 @@ bool Copy(const std::string& srcFilename, const std::string& destFilename)
}
// write output
if (!output.WriteBytes(buffer, BSIZE))
if (!output.WriteBytes(buffer, read_size))
{
ERROR_LOG(COMMON, "Copy: failed writing to output, %s --> %s: %s", srcFilename.c_str(),
destFilename.c_str(), GetLastErrorMsg().c_str());