Skip to content

Commit

Permalink
Fix favicon corruption on loading database
Browse files Browse the repository at this point in the history
* Fix keepassxreboot#2251 and Fix keepassxreboot#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.
  • Loading branch information
droidmonkey authored and Jean-Christophe Vassort committed Feb 20, 2019
1 parent bf4b6fb commit 53ca817
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/format/KdbxXmlReader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,10 @@ void KdbxXmlReader::parseIcon()
}

if (uuidSet && iconSet) {
// Check for duplicate UUID (corruption)
if (m_meta->containsCustomIcon(uuid)) {
uuid = QUuid::createUuid();
}
m_meta->addCustomIcon(uuid, icon);
return;
}
Expand Down

0 comments on commit 53ca817

Please sign in to comment.