[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sax/source sw/qa

[Michael Stahl]

 sax/source/expatwrap/sax_expat.cxx                                |   15 ++++++----
 sw/qa/core/data/odt/fail/c2dfc5bd-8366-40e7-b862-55e13fdc52dc.odt |binary
 2 files changed, 10 insertions(+), 5 deletions(-)

New commits:
commit 3604ca211204b9a0971a65c96a5075ba43f15693
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Sep 5 22:01:12 2017 +0200

    tdf#112164 sax: handle errors on last call to XML_Parse()
    
    If XML_Parse() is called with isFinal=1 and there are open tags, that is
    an error (XML_ERROR_NO_ELEMENTS) that must be converted to an exception.
    
    This reveals that we already had an incomplete input document, which
    needs to be moved to "fail" now.
    
    (cherry picked from commit e530a7ddb1c9423487ce936e6b23b8e36449d555)
    
    tdf#112164 add test document
    (cherry picked from commit aad2cdce2a2e89f35366c55878129d268cc92bef)
    
    Change-Id: I7ce3b51bd87923b5edde621508cf38d7ebbc2b14
    Reviewed-on: https://gerrit.libreoffice.org/41965
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx
index ba87c6f9e146..dfe2246eec19 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -670,18 +670,23 @@ void SaxExpatParser_Impl::parse( )
     while( nRead ) {
         nRead = getEntity().converter.readAndConvert( seqOut , nBufSize );
 
+        bool bContinue(false);
+
         if( ! nRead ) {
-            XML_Parse( getEntity().pParser ,
+            // last call - must return OK
+            XML_Status const ret = XML_Parse( getEntity().pParser,
                                    reinterpret_cast<const char *>(seqOut.getConstArray()),
                                    0 ,
                                    1 );
-            break;
-        }
-
-        bool bContinue = ( XML_Parse( getEntity().pParser ,
+            if (ret == XML_STATUS_OK) {
+                break;
+            }
+        } else {
+            bContinue = ( XML_Parse( getEntity().pParser,
                                                 reinterpret_cast<const char *>(seqOut.getConstArray()),
                                                 nRead,
                                                 0 ) != XML_STATUS_ERROR );
+        }
 
         if( ! bContinue || this->bExceptionWasThrown ) {
 
diff --git a/sw/qa/core/data/odt/fail/c2dfc5bd-8366-40e7-b862-55e13fdc52dc.odt b/sw/qa/core/data/odt/fail/c2dfc5bd-8366-40e7-b862-55e13fdc52dc.odt
new file mode 100644
index 000000000000..7cafa8d5e19b
Binary files /dev/null and b/sw/qa/core/data/odt/fail/c2dfc5bd-8366-40e7-b862-55e13fdc52dc.odt differ
diff --git a/sw/qa/core/data/odt/pass/tdf102018.odt b/sw/qa/core/data/odt/fail/tdf102018.odt
similarity index 100%
rename from sw/qa/core/data/odt/pass/tdf102018.odt
rename to sw/qa/core/data/odt/fail/tdf102018.odt