Merge pull request #5939 from JonnyH/WIP/broken-fstream-copy

Try to fix File::Copy with non-1024-byte aligned sizes
dolphin-emu · Aug 21, 2017 · 8280d15 · 8280d15
2 parents 92b375b + 643b3ba
commit 8280d15
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Source/Core/Common/FileUtil.cpp b/Source/Core/Common/FileUtil.cpp
@@ -358,7 +358,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", srcFilename.c_str(),
@@ -367,7 +367,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(), LastStrerrorString().c_str());