Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-07-25 07:45:22 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix KDBX4 reader/writer attachment mapping error

Browse source 
Write duplicate attachments to the binary inner header only once and
skip duplicate entries when reading a KDBX4 file.
This fixes a an attachment mapping problem when an attachment appears
more than once in a database (which occurs frequently when editing attachment
entries and history is turned on)
This commit is contained in:
Janek Bevendorff 2018-01-25 00:41:24 +01:00
parent ee03d44053
commit c18d6b5ae5
No known key found for this signature in database
GPG key ID: 2FDEB0D40BCA5E11
5 changed files with 40 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/format/Kdbx4Writer.cpp
View file

@ -211,12 +211,20 @@ bool Kdbx4Writer::writeInnerHeaderField(QIODevice* device, KeePass2::InnerHeader
void Kdbx4Writer::writeAttachments(QIODevice* device, Database* db)
{
const QList<Entry*> allEntries = db->rootGroup()->entriesRecursive(true);
QSet<QByteArray> writtenAttachments;
for (Entry* entry : allEntries) {
const QList<QString> attachmentKeys = entry->attachments()->keys();
for (const QString& key : attachmentKeys) {
QByteArray data = entry->attachments()->value(key);
data.prepend("\x01");
QByteArray data("\x01");
data.append(entry->attachments()->value(key));
if (writtenAttachments.contains(data)) {
continue;
}
writeInnerHeaderField(device, KeePass2::InnerHeaderFieldID::Binary, data);
writtenAttachments.insert(data);
}
}
}