kevin/meshtastic_firmware
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

SafeFile: use atomic rename-with-overwrite, rather than non-atomic delete-then-rename (#9296)

Browse Source
This commit is contained in:
Mike Robbins
2026-01-13 05:57:04 -06:00
committed by GitHub
parent 3640e35a8b
commit e99853f660
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/SafeFile.cpp
+2 -10
View File
@@ -54,7 +54,7 @@ size_t SafeFile::write(const uint8_t *buffer, size_t size)
} }
/** /**
* Atomically close the file (deleting any old versions) and readback the contents to confirm the hash matches * Atomically close the file (overwriting any old version) and readback the contents to confirm the hash matches
* *
* @return false for failure * @return false for failure
*/ */
@@ -73,15 +73,7 @@ bool SafeFile::close()
if (!testReadback()) if (!testReadback())
return false; return false;
{ // Scope for lock // Rename or overwrite (atomic operation)
concurrency::LockGuard g(spiLock);
// brief window of risk here ;-)
if (fullAtomic && FSCom.exists(filename.c_str()) && !FSCom.remove(filename.c_str())) {
LOG_ERROR("Can't remove old pref file");
return false;
}
}
String filenameTmp = filename; String filenameTmp = filename;
filenameTmp += ".tmp"; filenameTmp += ".tmp";
if (!renameFile(filenameTmp.c_str(), filename.c_str())) { if (!renameFile(filenameTmp.c_str(), filename.c_str())) {