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

framework: avoid double-free in ToolBarManager()

Browse Source 
The timer could run after the ToolBarManager is deleted because the
dispose() method can accidentally restart the timer somehow.

Change-Id: I86868f08f436976761e814d4cea1cd5a0e348935
This commit is contained in:
Michael Stahl 2014-10-31 17:51:46 +01:00
parent 03cca068ed
commit fc9e78f449
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
framework/source/uielement/toolbarmanager.cxx
View File

@ -243,6 +243,7 @@ ToolBarManager::ToolBarManager( const Reference< XComponentContext >& rxContext,
ToolBarManager::~ToolBarManager()
{
assert(!m_aAsyncUpdateControllersTimer.IsActive());
OSL_ASSERT( m_pToolBar == 0 );
OSL_ASSERT( !m_bAddedToTaskPaneList );
}
@ -475,7 +476,9 @@ throw ( RuntimeException, std::exception )
{
SolarMutexGuard g;
if ( Action.Action == FrameAction_CONTEXT_CHANGED )
{
m_aAsyncUpdateControllersTimer.Start();
}
}
void SAL_CALL ToolBarManager::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event )
@ -563,9 +566,6 @@ void SAL_CALL ToolBarManager::dispose() throw( RuntimeException, std::exception
{
SolarMutexGuard g;
// stop timer to prevent timer events after dispose
m_aAsyncUpdateControllersTimer.Stop();
RemoveControllers();
if ( m_xDocImageManager.is() )
@ -629,6 +629,10 @@ void SAL_CALL ToolBarManager::dispose() throw( RuntimeException, std::exception
m_xModuleAcceleratorManager.clear();
m_xDocAcceleratorManager.clear();
// stop timer to prevent timer events after dispose
// do it last because other calls could restart timer in StateChanged()
m_aAsyncUpdateControllersTimer.Stop();
m_bDisposed = true;
}
}
@ -1412,7 +1416,9 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
if( m_pToolBar->WillUsePopupMode() )
UpdateControllers();
else if ( m_pToolBar->IsReallyVisible() )
{
m_aAsyncUpdateControllersTimer.Start();
}
// Try to retrieve UIName from the container property set and set it as the title
// if it is not empty.
@ -2038,7 +2044,9 @@ IMPL_LINK( ToolBarManager, StateChanged, StateChangedType*, pStateChangedType )
else if ( *pStateChangedType == StateChangedType::VISIBLE )
{
if ( m_pToolBar->IsReallyVisible() )
{
m_aAsyncUpdateControllersTimer.Start();
}
}
else if ( *pStateChangedType == StateChangedType::INITSHOW )
{