[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sw/source

[Caolán McNamara]

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

New commits:
commit b816ad91b4cf6eeb30dff87859a8416cfdcbabbc
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>
    (cherry picked from commit e1f36eddf4596901a51de42322ccbf8d1df9d139)
    Reviewed-on: https://gerrit.libreoffice.org/35141
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 7be5340eb1b3..253d4e9c036b 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -3058,8 +3058,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();
+    }
 }
 
 SwConnectionDisposedListener_Impl::SwConnectionDisposedListener_Impl(SwDBManager& rManager)