KeePass2XmlReader: Don't fail wheh nreading empty UUIDs.

Closes #298
2015-07-13 21:00:12 +02:00
parent 154f1673e9
commit c6105a08ab
3 changed files with 19 additions and 2 deletions
--- a/src/format/KeePass2XmlReader.cpp
+++ b/src/format/KeePass2XmlReader.cpp
@@ -357,7 +357,7 @@ void KeePass2XmlReader::parseIcon()
    while (!m_xml.error() && m_xml.readNextStartElement()) {
        if (m_xml.name() == "UUID") {
            uuid = readUuid();
-            uuidSet = true;
+            uuidSet = !uuid.isNull();
        }
        else if (m_xml.name() == "Data") {
            icon.loadFromData(readBinary());
@@ -1104,7 +1104,10 @@ int KeePass2XmlReader::readNumber()
 Uuid KeePass2XmlReader::readUuid()
 {
    QByteArray uuidBin = readBinary();
-    if (uuidBin.length() != Uuid::Length) {
+    if (uuidBin.isEmpty()) {
+        return Uuid();
+    }
+    else if (uuidBin.length() != Uuid::Length) {
        if (m_strictMode) {
            raiseError("Invalid uuid value");
        }