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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Oct 17 08:06:28 UTC 2018


 sax/source/fastparser/fastparser.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1d63be277eb7daedc7c59850ab53b6341352d0fd
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Oct 16 21:30:52 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Oct 17 10:05:38 2018 +0200

    ofz: thread shenanigans
    
    Change-Id: I638b4e670f88aee78b6bd9ec638014795e103971
    Reviewed-on: https://gerrit.libreoffice.org/61851
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index 3d53147d9382..c910ad83381f 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -759,8 +759,8 @@ namespace
                     xmlFreeDoc(m_rEntity.mpParser->myDoc);
                 xmlFreeParserCtxt(m_rEntity.mpParser);
             }
-            m_rParser.popEntity();
             joinThread();
+            m_rParser.popEntity();
         }
         void setThread(const rtl::Reference<ParserThread> &xParser)
         {


More information about the Libreoffice-commits mailing list