Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-01-14 16:57:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Save to canonical path when dealing with symlinks

Browse Source
This commit is contained in:
Gianluca Recchia 2019-08-21 21:01:12 +02:00 committed by Jonathan White
parent 2aac83d03b
commit c12fd369d9
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/Database.cpp
View File

@ -211,6 +211,8 @@ bool Database::save(const QString& filePath, QString* error, bool atomic, bool b
return false; return false;
} }
auto& canonicalFilePath = QFileInfo::exists(filePath) ? QFileInfo(filePath).canonicalFilePath() : filePath;
if (atomic) { if (atomic) {
QSaveFile saveFile(filePath); QSaveFile saveFile(filePath);
if (saveFile.open(QIODevice::WriteOnly)) { if (saveFile.open(QIODevice::WriteOnly)) {
@ -220,7 +222,7 @@ bool Database::save(const QString& filePath, QString* error, bool atomic, bool b
} }
if (backup) { if (backup) {
backupDatabase(filePath); backupDatabase(canonicalFilePath);
} }
if (saveFile.commit()) { if (saveFile.commit()) {
@ -244,21 +246,21 @@ bool Database::save(const QString& filePath, QString* error, bool atomic, bool b
tempFile.close(); // flush to disk tempFile.close(); // flush to disk
if (backup) { if (backup) {
backupDatabase(filePath); backupDatabase(canonicalFilePath);
} }
// Delete the original db and move the temp file in place // Delete the original db and move the temp file in place
QFile::remove(filePath); QFile::remove(canonicalFilePath);
// Note: call into the QFile rename instead of QTemporaryFile // Note: call into the QFile rename instead of QTemporaryFile
// due to an undocumented difference in how the function handles // due to an undocumented difference in how the function handles
// errors. This prevents errors when saving across file systems. // errors. This prevents errors when saving across file systems.
if (tempFile.QFile::rename(filePath)) { if (tempFile.QFile::rename(canonicalFilePath)) {
// successfully saved the database // successfully saved the database
tempFile.setAutoRemove(false); tempFile.setAutoRemove(false);
setFilePath(filePath); setFilePath(filePath);
return true; return true;
} else if (!backup || !restoreDatabase(filePath)) { } else if (!backup || !restoreDatabase(canonicalFilePath)) {
// Failed to copy new database in place, and // Failed to copy new database in place, and
// failed to restore from backup or backups disabled // failed to restore from backup or backups disabled
tempFile.setAutoRemove(false); tempFile.setAutoRemove(false);