diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-02-27 12:31:07 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-03-14 13:39:29 +0100 |
| commit | fe8b2a1e72d99ea3f2604dafaf247ac1dd7c68b4 (patch) | |
| tree | 759d735a77834919de22e3aa2a9279b6d97cbd3c /xmlsecurity | |
| parent | 42847e040b902266324d677c7369f71e8c8f6346 (diff) | |
xmlsecurity PDF verify: fix parsing of nested dictionaries
This is triggered by an upcoming unit test for tdf#105093.
Change-Id: I3c8e8662fcadaea1f6e19bf6194d8159916f368b
Reviewed-on: https://gerrit.libreoffice.org/34678
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit a9a9b8155f65421fa8cb2bf108b847f212462f4f)
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/source/pdfio/pdfdocument.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xmlsecurity/source/pdfio/pdfdocument.cxx b/xmlsecurity/source/pdfio/pdfdocument.cxx index 50174483a832..6ffe711363c1 100644 --- a/xmlsecurity/source/pdfio/pdfdocument.cxx +++ b/xmlsecurity/source/pdfio/pdfdocument.cxx @@ -2974,7 +2974,7 @@ size_t PDFDictionaryElement::Parse(const std::vector< std::unique_ptr<PDFElement else { // Nested dictionary. - nIndex = PDFDictionaryElement::Parse(rElements, pDictionary, pDictionary->m_aItems); + i = PDFDictionaryElement::Parse(rElements, pDictionary, pDictionary->m_aItems); rDictionary[aName] = pDictionary; aName.clear(); } @@ -2987,7 +2987,7 @@ size_t PDFDictionaryElement::Parse(const std::vector< std::unique_ptr<PDFElement // Last dictionary end, track length and stop parsing. if (pThisObject) pThisObject->SetDictionaryLength(pEndDictionary->GetLocation() - nDictionaryOffset); - nRet = nIndex; + nRet = i; break; } } |