ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

rhbz#1001768: avoid deadlock in AccessibleEventNotifier

Browse Source 
revokeClientNotifyDisposing(): drop the static lclMutex before calling
pListeners->disposeAndClear(), which may want to acquire the SolarMutex
and deadlock.

Change-Id: Ib35fc7fad6596450a3b10d58d5193b9b55c575cb
This commit is contained in:
Michael Stahl
2013-08-28 14:47:33 +02:00
parent 36e1de2239
commit cafff1bbc4
1 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
comphelper/source/misc/accessibleeventnotifier.cxx
+19 -14
View File
@@ -133,29 +133,34 @@ namespace comphelper
void AccessibleEventNotifier::revokeClientNotifyDisposing( const TClientId _nClient,
const Reference< XInterface >& _rxEventSource ) SAL_THROW( ( ) )
{
::osl::MutexGuard aGuard( lclMutex::get() );
EventListeners * pListeners(0);
ClientMap::iterator aClientPos;
if ( !implLookupClient( _nClient, aClientPos ) )
// already asserted in implLookupClient
return;
{
// rhbz#1001768 drop the mutex before calling disposeAndClear
::osl::MutexGuard aGuard( lclMutex::get() );
ClientMap::iterator aClientPos;
if (!implLookupClient(_nClient, aClientPos))
// already asserted in implLookupClient
return;
// notify the listeners
pListeners = aClientPos->second;
// we do not need the entry in the clients map anymore
// (do this before actually notifying, because some client
// implementations have re-entrance problems and call into
// revokeClient while we are notifying from here)
Clients::get().erase(aClientPos);
}
// notify the "disposing" event for this client
EventObject aDisposalEvent;
aDisposalEvent.Source = _rxEventSource;
// notify the listeners
EventListeners* pListeners = aClientPos->second;
// we do not need the entry in the clients map anymore
// (do this before actually notifying, because some client implementations have re-entrance
// problems and call into revokeClient while we are notifying from hereing)
Clients::get().erase( aClientPos );
// now really do the notification
pListeners->disposeAndClear( aDisposalEvent );
delete pListeners;
}
//---------------------------------------------------------------------