[Libreoffice-commits] core.git: svtools/source

[Markus Mohrhard]

 svtools/source/misc/transfer.cxx |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit ed7e74ae1c7ecfc29df152a8397fb9f6e1763a60
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Thu Jul 14 21:59:30 2016 +0200

    try to avoid the deadlock around the clipboard, tdf#56818
    
    This deadlocks in the case that we have an external process
    communicating with LibreOffice as the SolarMutexReleaser allows a
    connection to be processed while the normal code has just released the
    SolarMutex. If the external call code now goes down the same code path
    we deadlock on the SolarMutex together with other mutexes in the
    clipboard code.
    
    Change-Id: I18fd6953c9566452a31b1a4c32c68494ec7a52ac
    Reviewed-on: https://gerrit.libreoffice.org/27251
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 216ae9e..b156b61 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -922,8 +922,6 @@ void TransferableHelper::CopyToClipboard( vcl::Window *pWindow ) const
 
     if( mxClipboard.is() && !mxTerminateListener.is() )
     {
-        SolarMutexReleaser aReleaser;
-
         try
         {
             TransferableHelper*                 pThis = const_cast< TransferableHelper* >( this );
@@ -949,8 +947,6 @@ void TransferableHelper::CopyToSelection( vcl::Window *pWindow ) const
 
     if( xSelection.is() && !mxTerminateListener.is() )
     {
-        SolarMutexReleaser aReleaser;
-
         try
         {
             TransferableHelper*                 pThis = const_cast< TransferableHelper* >( this );