Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-12-25 23:39:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix favicon corruption on loading database

Browse Source 
* Fix #2251 and Fix #2674
* Icons stored with duplicate UUID's will be
assigned a new UUID on load. This causes entries
using the duplicate UUID to display the default icon.
This commit is contained in:
Jonathan White 2019-02-03 08:18:28 -05:00
parent cc932eff30
commit b4de4369eb
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/format/KdbxXmlReader.cpp
View File

@ -367,6 +367,10 @@ void KdbxXmlReader::parseIcon()
} }
if (uuidSet && iconSet) { if (uuidSet && iconSet) {
// Check for duplicate UUID (corruption)
if (m_meta->containsCustomIcon(uuid)) {
uuid = QUuid::createUuid();
}
m_meta->addCustomIcon(uuid, icon); m_meta->addCustomIcon(uuid, icon);
return; return;
} }