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

Make KeePass2XmlReader::parseGroup() safe against reordered xml elements.

Browse source
This commit is contained in:
Felix Geyer 2013-04-14 14:54:56 +02:00
parent 3acb33e05a
commit 5588792344
3 changed files with 28 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/format/KeePass2XmlReader.cpp
View file

@ -411,7 +411,10 @@ Group* KeePass2XmlReader::parseGroup()
{
Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "Group");
Group* group = Q_NULLPTR;
Group* group = new Group();
group->setUpdateTimeinfo(false);
QList<Group*> children;
QList<Entry*> entries;
while (!m_xml.error() && m_xml.readNextStartElement()) {
if (m_xml.name() == "UUID") {
Uuid uuid = readUuid();
@ -419,7 +422,7 @@ Group* KeePass2XmlReader::parseGroup()
raiseError(1);
}
else {
group = getGroup(uuid);
group->setUuid(uuid);
}
}
else if (m_xml.name() == "Name") {
@ -493,13 +496,13 @@ Group* KeePass2XmlReader::parseGroup()
else if (m_xml.name() == "Group") {
Group* newGroup = parseGroup();
if (newGroup) {
newGroup->setParent(group);
children.append(newGroup);
}
}
else if (m_xml.name() == "Entry") {
Entry* newEntry = parseEntry(false);
if (newEntry) {
newEntry->setGroup(group);
entries.append(newEntry);
}
}
else {
@ -507,6 +510,20 @@ Group* KeePass2XmlReader::parseGroup()
}
}
Group* tmpGroup = group;
group = getGroup(tmpGroup->uuid());
group->copyDataFrom(tmpGroup);
group->setUpdateTimeinfo(false);
delete tmpGroup;
Q_FOREACH (Group* child, children) {
child->setParent(group);
}
Q_FOREACH (Entry* entry, entries) {
entry->setGroup(group);
}
return group;
}