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

[Caolán McNamara]

 sw/source/uibase/dbui/dbmgr.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit e1f36eddf4596901a51de42322ccbf8d1df9d139
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 13 12:44:10 2017 +0000

    Resolves: rhbz#1431540 crash in SwDBManager::releaseRevokeListener
    
    Change-Id: I8e61163de7e6192bdf613ab6b58906326499d6c2
    Reviewed-on: https://gerrit.libreoffice.org/35137
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index bc9ef4c..965ca0f 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -3112,8 +3112,11 @@ SwDoc* SwDBManager::getDoc() const
 
 void SwDBManager::releaseRevokeListener()
 {
-    pImpl->m_xDataSourceRemovedListener->Dispose();
-    pImpl->m_xDataSourceRemovedListener.clear();
+    if (pImpl->m_xDataSourceRemovedListener.is())
+    {
+        pImpl->m_xDataSourceRemovedListener->Dispose();
+        pImpl->m_xDataSourceRemovedListener.clear();
+    }
 }
 
 SwDBManager::ConnectionDisposedListener_Impl::ConnectionDisposedListener_Impl(SwDBManager& rManager)