Blame 0001-rhbz-1687589-KDE4-gpoll_wrapper-can-be-called-with-S.patch

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