mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

crashtesting: "use" loop in moz325427-1.svg

Browse Source 
Change-Id: I6ea2aaa5ca857d89342b9d18bd4cbedbeeea2b2f
This commit is contained in:
Caolán McNamara
2016-12-07 10:24:16 +00:00
parent 1d752159f4
commit 62283fed20
1 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
filter/source/svg/svgreader.cxx
View File

@@ -189,6 +189,33 @@ struct AnnotatingVisitor
writeStyle(xElem,nTagId); writeStyle(xElem,nTagId);
} }
bool IsAncestorId(const uno::Reference<xml::dom::XNode>& xParentNode, const OUString& rValue)
{
bool bSelfCycle = false;
if (xParentNode.is())
{
if (xParentNode->hasAttributes())
{
const uno::Reference<xml::dom::XNamedNodeMap> xParentAttributes = xParentNode->getAttributes();
const sal_Int32 nFooNumAttrs(xParentAttributes->getLength());
for (sal_Int32 i=0; i < nFooNumAttrs; ++i)
{
const sal_Int32 nTokenId(getTokenId(xParentAttributes->item(i)->getNodeName()));
if (XML_ID == nTokenId)
{
OUString sParentID = xParentAttributes->item(i)->getNodeValue();
bSelfCycle = sParentID == rValue;
break;
}
}
}
if (!bSelfCycle)
bSelfCycle = IsAncestorId(xParentNode->getParentNode(), rValue);
}
return bSelfCycle;
}
void operator()( const uno::Reference<xml::dom::XElement>& xElem, void operator()( const uno::Reference<xml::dom::XElement>& xElem,
const uno::Reference<xml::dom::XNamedNodeMap>& xAttributes ) const uno::Reference<xml::dom::XNamedNodeMap>& xAttributes )
{ {
@@ -294,27 +321,10 @@ struct AnnotatingVisitor
bool bFound = aFound != maElementIdMap.end(); bool bFound = aFound != maElementIdMap.end();
if (bFound) if (bFound)
{ {
bool bSelfCycle = false; const bool bSelfCycle = IsAncestorId(xElem->getParentNode(), sValue);
uno::Reference<xml::dom::XNode> xParentNode(xElem->getParentNode());
if (xParentNode.is() && xParentNode->hasAttributes())
{
const uno::Reference<xml::dom::XNamedNodeMap> xParentAttributes = xParentNode->getAttributes();
const sal_Int32 nFooNumAttrs(xParentAttributes->getLength());
for (sal_Int32 i=0; i < nFooNumAttrs; ++i)
{
const sal_Int32 nTokenId(getTokenId(xParentAttributes->item(i)->getNodeName()));
if (XML_ID == nTokenId)
{
OUString sParentID = xParentAttributes->item(i)->getNodeValue();
bSelfCycle = sParentID == sValue;
break;
}
}
}
if (bSelfCycle) if (bSelfCycle)
{ {
SAL_WARN("filter.svg", "\"use\" declaration with target of ancestor node, causing use cycle");
//drop this invalid self-referencing "use" node //drop this invalid self-referencing "use" node
maElementIdMap.erase(aFound); maElementIdMap.erase(aFound);
bFound = false; bFound = false;