[Libreoffice-commits] core.git: xmlsecurity/source

[Miklos Vajna]

 xmlsecurity/source/pdfio/pdfdocument.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a9a9b8155f65421fa8cb2bf108b847f212462f4f
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Feb 27 12:31:07 2017 +0100

    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 at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/xmlsecurity/source/pdfio/pdfdocument.cxx b/xmlsecurity/source/pdfio/pdfdocument.cxx
index 5017448..6ffe711 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;
             }
         }