diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-08-17 20:53:13 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-08-20 16:40:11 +0200 |
| commit | 37198ff27be127213e4dac091a20c6fb343909fd (patch) | |
| tree | 22857f1bff287526cafbd157eddb3fc34e8a2251 | |
| parent | e1b299de1d56abacf3f16552f9f8e6361b360d1b (diff) | |
fdo#72695: avoid double-free race condition for SwXTextTable
Change-Id: Ibd27e8d61ccbe7d1cdeb72d310acea54198ecd77
| -rw-r--r-- | sw/source/core/unocore/unotbl.cxx | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index 70a76290aba5..f709c22022a0 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -1958,6 +1958,7 @@ private: ::osl::Mutex m_Mutex; // just for OInterfaceContainerHelper public: + uno::WeakReference<uno::XInterface> m_wThis; ::cppu::OMultiTypeInterfaceContainerHelper m_Listeners; Impl() : m_Listeners(m_Mutex) { } @@ -2237,6 +2238,8 @@ SwXTextTable::CreateXTextTable(SwFrmFmt *const pFrmFmt) { pFrmFmt->SetXObject(xTable); } + // need a permanent Reference to initialize m_wThis + pNew->m_pImpl->m_wThis = xTable; } return xTable; } @@ -3702,7 +3705,12 @@ void SwXTextTable::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) ClientModify(this, pOld, pNew); if(!GetRegisteredIn()) { - lang::EventObject const ev(static_cast< ::cppu::OWeakObject&>(*this)); + uno::Reference<uno::XInterface> const xThis(m_pImpl->m_wThis); + if (!xThis.is()) + { // fdo#72695: if UNO object is already dead, don't revive it with event + return; + } + lang::EventObject const ev(xThis); m_pImpl->m_Listeners.disposeAndClear(ev); } else |