Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-09-19 23:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

When parsing make sure that databases contain at least the root group.

Browse Source
This commit is contained in:
Felix Geyer 2013-04-20 19:01:43 +02:00
parent 3be7fa6b3b
commit e16720d06d
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/format/KeePass2XmlReader.cpp
View File

@ -51,12 +51,18 @@ void KeePass2XmlReader::readDatabase(QIODevice* device, Database* db, KeePass2Ra
m_tmpParent = new Group();
bool rootGroupParsed = false;
if (!m_xml.error() && m_xml.readNextStartElement()) {
if (m_xml.name() == "KeePassFile") {
parseKeePassFile();
rootGroupParsed = parseKeePassFile();
}
}
if (!m_xml.error() && !rootGroupParsed) {
raiseError(28);
}
if (!m_xml.error()) {
if (!m_tmpParent->children().isEmpty()) {
qWarning("KeePass2XmlReader::readDatabase: found %d invalid group reference(s)",
@ -141,21 +147,25 @@ QByteArray KeePass2XmlReader::headerHash()
return m_headerHash;
}
void KeePass2XmlReader::parseKeePassFile()
bool KeePass2XmlReader::parseKeePassFile()
{
Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "KeePassFile");
bool rootParsed = false;
while (!m_xml.error() && m_xml.readNextStartElement()) {
if (m_xml.name() == "Meta") {
parseMeta();
}
else if (m_xml.name() == "Root") {
parseRoot();
rootParsed = parseRoot();
}
else {
skipCurrentElement();
}
}
return rootParsed;
}
void KeePass2XmlReader::parseMeta()
@ -409,10 +419,12 @@ void KeePass2XmlReader::parseCustomDataItem()
}
}
void KeePass2XmlReader::parseRoot()
bool KeePass2XmlReader::parseRoot()
{
Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "Root");
bool groupParsed = false;
while (!m_xml.error() && m_xml.readNextStartElement()) {
if (m_xml.name() == "Group") {
Group* rootGroup = parseGroup();
@ -420,6 +432,7 @@ void KeePass2XmlReader::parseRoot()
Group* oldRoot = m_db->rootGroup();
m_db->setRootGroup(rootGroup);
delete oldRoot;
groupParsed = true;
}
}
else if (m_xml.name() == "DeletedObjects") {
@ -429,6 +442,8 @@ void KeePass2XmlReader::parseRoot()
skipCurrentElement();
}
}
return groupParsed;
}
Group* KeePass2XmlReader::parseGroup()

4
src/format/KeePass2XmlReader.h
View File

@ -49,7 +49,7 @@ public:
QByteArray headerHash();
private:
void parseKeePassFile();
bool parseKeePassFile();
void parseMeta();
void parseMemoryProtection();
void parseCustomIcons();
@ -57,7 +57,7 @@ private:
void parseBinaries();
void parseCustomData();
void parseCustomDataItem();
void parseRoot();
bool parseRoot();
Group* parseGroup();
void parseDeletedObjects();
void parseDeletedObject();