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 #10419 from OatmealDome/mac-updater-rename 

UpdaterCommon: Copy content file to a temporary file before renaming on macOS
This commit is contained in:
JMC47 2022-01-30 19:45:58 -05:00 committed by GitHub
parent d3742c1555 90665fbabe
commit 8e21495c59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Core/UpdaterCommon/UpdaterCommon.cpp
View File

@ -435,8 +435,19 @@ bool UpdateFiles(const std::vector<TodoList::UpdateOp>& to_update,
// Unfortunately, there is a quirk in the kernel with how it handles the cache: if the file is // Unfortunately, there is a quirk in the kernel with how it handles the cache: if the file is
// simply overwritten, the cache isn't invalidated and the old code signature is used to verify // simply overwritten, the cache isn't invalidated and the old code signature is used to verify
// the new file. This causes macOS to kill the process with a code signing error. To workaround // the new file. This causes macOS to kill the process with a code signing error. To workaround
// this, we use File::Rename() instead of File::Copy(). // this, we use File::Rename() instead of File::Copy(). However, this also means that if two
if (!File::Rename(temp_path + DIR_SEP + content_filename, path)) // files have the same hash, the first file will succeed, but the second file will fail because
// the source file no longer exists. To deal with this, we copy the content file to a temporary
// file and then rename the temporary file to the destination path.
const std::string temporary_file = temp_path + DIR_SEP + "temporary_file";
if (!File::Copy(temp_path + DIR_SEP + content_filename, temporary_file))
{
fprintf(log_fp, "Could not copy %s to %s.\n", content_filename.c_str(),
temporary_file.c_str());
return false;
}
if (!File::Rename(temporary_file, path))
#else #else
if (!File::Copy(temp_path + DIR_SEP + content_filename, path)) if (!File::Copy(temp_path + DIR_SEP + content_filename, path))
#endif #endif