Merge branch '2.0'

2016-02-08 18:13:29 +01:00
parent bfae81ec70 3679b21701
commit d6d92ce90a
20 changed files with 382 additions and 176 deletions
--- a/src/format/KeePass2XmlReader.cpp
+++ b/src/format/KeePass2XmlReader.cpp
@@ -523,6 +523,7 @@ Group* KeePass2XmlReader::parseGroup()
                if (m_strictMode) {
                    raiseError("Invalid group icon number");
                }
+                iconId = 0;
            }
            else {
                if (iconId >= DatabaseIcons::IconCount) {
@@ -702,6 +703,7 @@ Entry* KeePass2XmlReader::parseEntry(bool history)
                if (m_strictMode) {
                    raiseError("Invalid entry icon number");
                }
+                iconId = 0;
            }
            else {
                entry->setIcon(iconId);