diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-08-01 12:04:30 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-08-08 11:33:35 +0200 |
| commit | d63463b0001cc6a439840d0cee36b6678aea467e (patch) | |
| tree | dff0520a6ab722661fff2b52f8458ff80cd4680e /vcl | |
| parent | 58b4de56a389463eaef6dd228ffb7f37c1ba6103 (diff) | |
forcepoint#65 pdf page visiting revisits itself
Change-Id: I6d9eb75f0850a94814fb4d69ea1442b826674496
Reviewed-on: https://gerrit.libreoffice.org/58418
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit e6d5ef741c75895ed97801112823b8332557d79a)
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/filter/ipdf/pdfdocument.cxx | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/vcl/source/filter/ipdf/pdfdocument.cxx b/vcl/source/filter/ipdf/pdfdocument.cxx index b2c3a8577469..20a2b951ab6c 100644 --- a/vcl/source/filter/ipdf/pdfdocument.cxx +++ b/vcl/source/filter/ipdf/pdfdocument.cxx @@ -1769,15 +1769,17 @@ const std::vector< std::unique_ptr<PDFElement> >& PDFDocument::GetElements() } /// Visits the page tree recursively, looking for page objects. -static void visitPages(PDFObjectElement* pPages, std::vector<PDFObjectElement*>& rRet) +void PDFObjectElement::visitPages(std::vector<PDFObjectElement*>& rRet) { - auto pKids = dynamic_cast<PDFArrayElement*>(pPages->Lookup("Kids")); + auto pKids = dynamic_cast<PDFArrayElement*>(Lookup("Kids")); if (!pKids) { SAL_WARN("vcl.filter", "visitPages: pages has no kids"); return; } + m_bVisiting = true; + for (const auto& pKid : pKids->GetElements()) { auto pReference = dynamic_cast<PDFReferenceElement*>(pKid); @@ -1788,14 +1790,23 @@ static void visitPages(PDFObjectElement* pPages, std::vector<PDFObjectElement*>& if (!pKidObject) continue; + // detect if visiting reenters itself + if (pKidObject->m_bVisiting) + { + SAL_WARN("vcl.filter", "visitPages: loop in hierarchy"); + continue; + } + auto pName = dynamic_cast<PDFNameElement*>(pKidObject->Lookup("Type")); if (pName && pName->GetValue() == "Pages") // Pages inside pages: recurse. - visitPages(pKidObject, rRet); + pKidObject->visitPages(rRet); else // Found an actual page. rRet.push_back(pKidObject); } + + m_bVisiting = false; } std::vector<PDFObjectElement*> PDFDocument::GetPages() @@ -1840,7 +1851,7 @@ std::vector<PDFObjectElement*> PDFDocument::GetPages() return aRet; } - visitPages(pPages, aRet); + pPages->visitPages(aRet); return aRet; } @@ -2138,6 +2149,7 @@ PDFObjectElement::PDFObjectElement(PDFDocument& rDoc, double fObjectValue, doubl : m_rDoc(rDoc), m_fObjectValue(fObjectValue), m_fGenerationValue(fGenerationValue), + m_bVisiting(false), m_pNumberElement(nullptr), m_nDictionaryOffset(0), m_nDictionaryLength(0), |