comphelper/source/misc/accessiblecontexthelper.cxx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit facd4bb410ce6b5f6d74f836affc7553babb05cf
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Oct 2 23:00:09 2013 +0200
rhbz#1001768: avoid deadlock in OAccessibleContextHelper::disposing()
De facto this class is locked by SolarMutex, which is what the
OExternalLockGuard actually locks;
do not lock m_Mutex because it may cause deadlock.
Change-Id: I88b226d73dbef9a5803347b0ac3191bec2ba4515
(cherry picked from commit 4100e3b6204fc304cc7b60b9d7ff2af75118b805)
Reviewed-on: https://gerrit.libreoffice.org/6114
Tested-by: Michael Meeks <michael.me...@collabora.com>
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
diff --git a/comphelper/source/misc/accessiblecontexthelper.cxx
b/comphelper/source/misc/accessiblecontexthelper.cxx
index b3169fd..bb9047d 100644
--- a/comphelper/source/misc/accessiblecontexthelper.cxx
+++ b/comphelper/source/misc/accessiblecontexthelper.cxx
@@ -123,7 +123,9 @@ namespace comphelper
//---------------------------------------------------------------------
void SAL_CALL OAccessibleContextHelper::disposing()
{
- ::osl::ClearableMutexGuard aGuard( GetMutex() );
+ // rhbz#1001768: de facto this class is locked by SolarMutex;
+ // do not lock m_Mutex because it may cause deadlock
+ OMutexGuard aGuard( getExternalLock() );
if ( m_pImpl->getClientId( ) )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
