mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vcl::EventPoster shall probably be covered by SolarMutex

Browse Source 
...as most parts of VCL.  Ran across at least one case where a remote call to
framework::CloseDispatcher::release -> ~CloseDispatcher -> ~EventPoster ->
Application::RemoveUserEvent caused a crash.  As always with SolarMutex, keep
fingers crossed that this is about the right level to acquire it.

Change-Id: I8f4be7329adbf72355774fa5d3c472270da3ddd2
This commit is contained in:
Stephan Bergmann
2014-05-06 16:33:55 +02:00
parent 36e22e83a1
commit db06595d13
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
framework/inc/dispatch/closedispatcher.hxx
View File

@@ -36,6 +36,7 @@
#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/frame/DispatchResultState.hpp> #include <com/sun/star/frame/DispatchResultState.hpp>
#include <boost/scoped_ptr.hpp>
#include <cppuhelper/implbase2.hxx> #include <cppuhelper/implbase2.hxx>
#include <vcl/evntpost.hxx> #include <vcl/evntpost.hxx>
@@ -88,7 +89,7 @@ class CloseDispatcher : public ::cppu::WeakImplHelper2<
/** @short used for asynchronous callbacks within the main thread. /** @short used for asynchronous callbacks within the main thread.
@descr Internally we work asynchronous. Because our callis @descr Internally we work asynchronous. Because our callis
are not aware, that her request can kill its own environment ... */ are not aware, that her request can kill its own environment ... */
::vcl::EventPoster m_aAsyncCallback; boost::scoped_ptr<vcl::EventPoster> m_aAsyncCallback;
/** @short used inside asyncronous callback to decide, /** @short used inside asyncronous callback to decide,
which operation must be executed. */ which operation must be executed. */

10
framework/source/dispatch/closedispatcher.cxx
View File

@@ -57,7 +57,8 @@ CloseDispatcher::CloseDispatcher(const css::uno::Reference< css::uno::XComponent
const css::uno::Reference< css::frame::XFrame >& xFrame , const css::uno::Reference< css::frame::XFrame >& xFrame ,
const OUString& sTarget) const OUString& sTarget)
: m_xContext (rxContext ) : m_xContext (rxContext )
, m_aAsyncCallback (LINK( this, CloseDispatcher, impl_asyncCallback)) , m_aAsyncCallback(
new vcl::EventPoster(LINK(this, CloseDispatcher, impl_asyncCallback)))
, m_eOperation(E_CLOSE_DOC) , m_eOperation(E_CLOSE_DOC)
, m_lStatusListener(m_mutex) , m_lStatusListener(m_mutex)
, m_pSysWindow(NULL) , m_pSysWindow(NULL)
@@ -77,6 +78,8 @@ CloseDispatcher::CloseDispatcher(const css::uno::Reference< css::uno::XComponent
CloseDispatcher::~CloseDispatcher() CloseDispatcher::~CloseDispatcher()
{ {
SolarMutexGuard g;
m_aAsyncCallback.reset();
} }
void SAL_CALL CloseDispatcher::dispatch(const css::util::URL& aURL , void SAL_CALL CloseDispatcher::dispatch(const css::util::URL& aURL ,
@@ -215,7 +218,10 @@ void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL&
if ( bIsSynchron ) if ( bIsSynchron )
impl_asyncCallback(0); impl_asyncCallback(0);
else else
m_aAsyncCallback.Post(0); {
SolarMutexGuard g;
m_aAsyncCallback->Post(0);
}
} }
/** /**

6
vcl/source/helper/evntpost.cxx
View File

@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <sal/config.h>
#include <tools/debug.hxx>
#include <vcl/evntpost.hxx> #include <vcl/evntpost.hxx>
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
@@ -31,6 +34,7 @@ EventPoster::EventPoster( const Link& rLink )
EventPoster::~EventPoster() EventPoster::~EventPoster()
{ {
DBG_TESTSOLARMUTEX();
if ( m_nId ) if ( m_nId )
GetpApp()->RemoveUserEvent( m_nId ); GetpApp()->RemoveUserEvent( m_nId );
} }
@@ -38,11 +42,13 @@ EventPoster::~EventPoster()
void EventPoster::Post( UserEvent* pEvent ) void EventPoster::Post( UserEvent* pEvent )
{ {
DBG_TESTSOLARMUTEX();
m_nId = GetpApp()->PostUserEvent( ( LINK( this, EventPoster, DoEvent_Impl ) ), pEvent ); m_nId = GetpApp()->PostUserEvent( ( LINK( this, EventPoster, DoEvent_Impl ) ), pEvent );
} }
IMPL_LINK( EventPoster, DoEvent_Impl, UserEvent*, pEvent ) IMPL_LINK( EventPoster, DoEvent_Impl, UserEvent*, pEvent )
{ {
DBG_TESTSOLARMUTEX();
m_nId = 0; m_nId = 0;
m_aLink.Call( pEvent ); m_aLink.Call( pEvent );
return 0; return 0;