rixxc/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-12-04 15:39:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make sure we don't create DeletedObjects when importing databases.

Browse Source
This commit is contained in:
Felix Geyer
2012-05-10 22:54:26 +02:00
parent 366d8a0f0e
commit 65bdc207b7
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/format/KeePass1Reader.cpp
View File

@@ -198,6 +198,11 @@ Database* KeePass1Reader::readDatabase(QIODevice* device, const QString& passwor
delete entry;
}
else {
quint32 groupId = m_entryGroupIds.value(entry);
if (!m_groupIds.contains(groupId)) {
return 0;
}
entry->setGroup(m_groupIds.value(groupId));
entry->setUuid(Uuid::random());
}
}
@@ -540,7 +545,7 @@ Entry* KeePass1Reader::readEntry(QIODevice* cipherStream)
return 0;
}
quint32 groupId = Endian::bytesToUInt32(fieldData, KeePass1::BYTEORDER);
entry->setGroup(m_groupIds.value(groupId));
m_entryGroupIds.insert(entry.data(), groupId);
break;
}
case 0x0003: