|
 |
6d49447 |
From ad313992da1cf89f5825a4d1eb020392b5e32c6d Mon Sep 17 00:00:00 2001
|
|
|
6d49447 |
From: Stephan Bergmann <sbergman@redhat.com>
|
|
|
6d49447 |
Date: Tue, 19 Mar 2019 17:29:53 +0100
|
|
|
6d49447 |
Subject: [PATCH] rhbz#1687589: KDE4 gpoll_wrapper can be called with
|
|
|
6d49447 |
SolarMutex unlocked
|
|
|
6d49447 |
|
|
|
6d49447 |
...when called from MountOperation::Mount (ucb/source/ucp/gio/gio_content.cxx),
|
|
|
6d49447 |
which itself contains a SolarMutexReleaser since
|
|
|
6d49447 |
2eb36dc4b846ab5886ae71fd2978b56b2a2d1d08 "Hack to not leave SolarMutex released
|
|
|
6d49447 |
after g_main_loop_run call". So calling SolarMutexReleaser ctor in
|
|
|
6d49447 |
gpoll_wrapper will then cause comphelper::GenericSolarMutex::doRelease
|
|
|
6d49447 |
(comphelper/source/misc/solarmutex.cxx) to call std::abort() because the
|
|
|
6d49447 |
SolarMutex is not locked.
|
|
|
6d49447 |
|
|
|
6d49447 |
Change-Id: If893b427e404cf3d9e48430f84cff7d32b61bf87
|
|
|
6d49447 |
Reviewed-on: https://gerrit.libreoffice.org/69436
|
|
|
6d49447 |
Tested-by: Jenkins
|
|
|
6d49447 |
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
|
|
|
6d49447 |
---
|
|
|
6d49447 |
vcl/unx/kde4/KDEXLib.cxx | 11 +++++++++--
|
|
|
6d49447 |
1 file changed, 9 insertions(+), 2 deletions(-)
|
|
|
6d49447 |
|
|
|
6d49447 |
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
|
|
|
6d49447 |
index 0852c543a6d7..22274690842b 100644
|
|
|
6d49447 |
--- a/vcl/unx/kde4/KDEXLib.cxx
|
|
|
6d49447 |
+++ b/vcl/unx/kde4/KDEXLib.cxx
|
|
|
6d49447 |
@@ -210,8 +210,15 @@ static GPollFunc old_gpoll = nullptr;
|
|
|
6d49447 |
|
|
|
6d49447 |
static gint gpoll_wrapper( GPollFD* ufds, guint nfds, gint timeout )
|
|
|
6d49447 |
{
|
|
|
6d49447 |
- SolarMutexReleaser aReleaser;
|
|
|
6d49447 |
- return old_gpoll( ufds, nfds, timeout );
|
|
|
6d49447 |
+ if (GetSalData()->m_pInstance->GetYieldMutex()->IsCurrentThread())
|
|
|
6d49447 |
+ {
|
|
|
6d49447 |
+ SolarMutexReleaser aReleaser;
|
|
|
6d49447 |
+ return old_gpoll( ufds, nfds, timeout );
|
|
|
6d49447 |
+ }
|
|
|
6d49447 |
+ else
|
|
|
6d49447 |
+ {
|
|
|
6d49447 |
+ return old_gpoll( ufds, nfds, timeout );
|
|
|
6d49447 |
+ }
|
|
|
6d49447 |
}
|
|
|
6d49447 |
#endif
|
|
|
6d49447 |
|
|
|
6d49447 |
--
|
|
|
6d49447 |
2.20.1
|
|
|
6d49447 |
|