godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #73156 from gw2cc/safe_save 

Create a safe temporary file with is_backup_save_enabled
This commit is contained in:
Yuri Sizov 2023-03-16 12:05:48 +01:00 committed by GitHub
parent bdefdc866b 345f5757e5
commit ea31842b72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/unix/file_access_unix.cpp
View File

@ -100,6 +100,11 @@ Error FileAccessUnix::open_internal(const String &p_path, int p_mode_flags) {
if (is_backup_save_enabled() && (p_mode_flags == WRITE)) { if (is_backup_save_enabled() && (p_mode_flags == WRITE)) {
save_path = path; save_path = path;
// Create a temporary file in the same directory as the target file.
path = path + "-XXXXXX";
if (!mkstemp(path.utf8().ptrw())) {
return ERR_FILE_CANT_OPEN;
}
path = path + ".tmp"; path = path + ".tmp";
} }
@ -143,7 +148,7 @@ void FileAccessUnix::_close() {
} }
if (!save_path.is_empty()) { if (!save_path.is_empty()) {
int rename_error = rename((save_path + ".tmp").utf8().get_data(), save_path.utf8().get_data()); int rename_error = rename(path.utf8().get_data(), save_path.utf8().get_data());
if (rename_error && close_fail_notify) { if (rename_error && close_fail_notify) {
close_fail_notify(save_path); close_fail_notify(save_path);

14
drivers/windows/file_access_windows.cpp
View File

@ -130,10 +130,16 @@ Error FileAccessWindows::open_internal(const String &p_path, int p_mode_flags) {
if (is_backup_save_enabled() && p_mode_flags == WRITE) { if (is_backup_save_enabled() && p_mode_flags == WRITE) {
save_path = path; save_path = path;
path = path + ".tmp"; // Create a temporary file in the same directory as the target file.
WCHAR tmpFileName[MAX_PATH];
if (GetTempFileNameW((LPCWSTR)(path.get_base_dir().utf16().get_data()), (LPCWSTR)(path.get_file().utf16().get_data()), 0, tmpFileName) == 0) {
last_error = ERR_FILE_CANT_OPEN;
return last_error;
}
path = tmpFileName;
} }
f = _wfsopen((LPCWSTR)(path.utf16().get_data()), mode_string, _SH_DENYNO); f = _wfsopen((LPCWSTR)(path.utf16().get_data()), mode_string, is_backup_save_enabled() ? _SH_SECURE : _SH_DENYNO);
if (f == nullptr) { if (f == nullptr) {
switch (errno) { switch (errno) {
@ -178,10 +184,10 @@ void FileAccessWindows::_close() {
if (!PathFileExistsW((LPCWSTR)(save_path.utf16().get_data()))) { if (!PathFileExistsW((LPCWSTR)(save_path.utf16().get_data()))) {
#endif #endif
// Creating new file // Creating new file
rename_error = _wrename((LPCWSTR)((save_path + ".tmp").utf16().get_data()), (LPCWSTR)(save_path.utf16().get_data())) != 0; rename_error = _wrename((LPCWSTR)(path.utf16().get_data()), (LPCWSTR)(save_path.utf16().get_data())) != 0;
} else { } else {
// Atomic replace for existing file // Atomic replace for existing file
rename_error = !ReplaceFileW((LPCWSTR)(save_path.utf16().get_data()), (LPCWSTR)((save_path + ".tmp").utf16().get_data()), nullptr, 2 | 4, nullptr, nullptr); rename_error = !ReplaceFileW((LPCWSTR)(save_path.utf16().get_data()), (LPCWSTR)(path.utf16().get_data()), nullptr, 2 | 4, nullptr, nullptr);
} }
if (rename_error) { if (rename_error) {
attempts--; attempts--;