Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-10-01 01:26:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

KeePass2XmlReader: Don't fail wheh nreading empty UUIDs.

Browse Source 
Closes #298
This commit is contained in:
Felix Geyer 2015-07-13 21:00:12 +02:00
parent 154f1673e9
commit c6105a08ab
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/format/KeePass2XmlReader.cpp
View File

@ -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");
}

13
tests/TestKeePass2XmlReader.cpp
View File

@ -395,6 +395,19 @@ void TestKeePass2XmlReader::testBroken_data()
QTest::newRow("BrokenDeletedObjects (not strict)") << "BrokenDeletedObjects" << false << false;
}
void TestKeePass2XmlReader::testEmptyUuids()
{
KeePass2XmlReader reader;
reader.setStrictMode(true);
QString xmlFile = QString("%1/%2.xml").arg(KEEPASSX_TEST_DATA_DIR, "EmptyUuids");
QVERIFY(QFile::exists(xmlFile));
QScopedPointer<Database> db(reader.readDatabase(xmlFile));
if (reader.hasError()) {
qWarning("Reader error: %s", qPrintable(reader.errorString()));
}
QVERIFY(!reader.hasError());
}
void TestKeePass2XmlReader::cleanupTestCase()
{
delete m_db;

1
tests/TestKeePass2XmlReader.h
View File

@ -41,6 +41,7 @@ private Q_SLOTS:
void testDeletedObjects();
void testBroken();
void testBroken_data();
void testEmptyUuids();
void cleanupTestCase();
private: