Hey,
this patch fixes a crash in 3-5. We delete the thread while it is
still running. The patch just adds a Thread::join call to wait till
the thread is correctly termintated before the thread is deleted.
I think the patch is safe and should be applied to 3-5 and maybe even to 3-5-0.
Regards,
Markus
From 43f367c00e8a23a4ed9431f7d5f23110a2020957 Mon Sep 17 00:00:00 2001
From: Markus Mohrhard <markus.mohrhard@googlemail.com>
Date: Tue, 31 Jan 2012 21:44:00 +0100
Subject: [PATCH] don't delete thread while it is still running, fdo#45401
---
filter/source/xsltfilter/LibXSLTTransformer.cxx | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx
b/filter/source/xsltfilter/LibXSLTTransformer.cxx
index 72c31c1..599b80c 100644
--- a/filter/source/xsltfilter/LibXSLTTransformer.cxx
+++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx
@@ -485,6 +485,7 @@ namespace XSLT
LibXSLTTransformer::terminate() throw (RuntimeException)
{
m_Reader->terminate();
+ m_Reader->join();
delete(m_Reader);
m_parameters.clear();
}
--
1.7.7
Context
- [Libreoffice] [REVIEW] fix for fd#45401, crash in our inbuild xslt transformation filters · Markus Mohrhard
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.