From c9cc62fc9cf6b017454589f673ef5e69ebe24b91 Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@collabora.com>
Date: Tue, 11 Sep 2018 22:28:08 +0100
Subject: Ensure fastparser thread is joined in case of exceptions.

Change-Id: Ie0fb21776514a9a67e9fdff2ae856392cd711adb
Reviewed-on: https://gerrit.libreoffice.org/60542
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit d06a8ce1434c1dcb45770e08395443771f57f1e9)
(cherry picked from commit 8325f20088c812fedbb94d8fd421c652f6d73db9)
---
 sax/source/fastparser/fastparser.cxx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index 9959489eed3f..9d4a4fe29d86 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -825,6 +825,7 @@ void FastSaxParserImpl::parseStream(const InputSource& maStructSource)
     {
         rtl::Reference<ParserThread> xParser;
         xParser = new ParserThread(this);
+        aEnsureFree.setThread(xParser);
         xParser->launch();
         aEnsureFree.setThread(xParser);
         bool done = false;
-- 
cgit