From ca6bf0b7668c71e84c5f0f00d9a928b790205305 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mar 13 2017 12:47:39 +0000 Subject: Resolves: rhbz#1431540 crash in SwDBManager releaseRef --- diff --git a/0001-Resolves-rhbz-1431540-crash-in-SwDBManager-releaseRe.patch b/0001-Resolves-rhbz-1431540-crash-in-SwDBManager-releaseRe.patch new file mode 100644 index 0000000..0b9b72b --- /dev/null +++ b/0001-Resolves-rhbz-1431540-crash-in-SwDBManager-releaseRe.patch @@ -0,0 +1,32 @@ +From 579be121f66fa720cbb8ab2e688ea3aa41dc59b4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Mon, 13 Mar 2017 12:44:10 +0000 +Subject: [PATCH] Resolves: rhbz#1431540 crash in + SwDBManager::releaseRevokeListener + +Change-Id: I8e61163de7e6192bdf613ab6b58906326499d6c2 +--- + sw/source/uibase/dbui/dbmgr.cxx | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx +index 7be5340..253d4e9 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) +-- +2.9.3 + diff --git a/libreoffice.spec b/libreoffice.spec index fcf94da..073cdf1 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -274,6 +274,7 @@ Patch38: 0001-Resolves-tdf-106261-throw-away-old-node-map-for-tabl.patch Patch39: 0001-show-the-last-gif-frame-when-the-animation-ends.patch Patch40: 0001-tdf-106218-sw-compare-document-tweak-special-handlin.patch Patch41: 0001-rhbz-1431476-dnd-has-started-copying-instead-of-movi.patch +Patch42: 0001-Resolves-rhbz-1431540-crash-in-SwDBManager-releaseRe.patch %if 0%{?fedora} >= 26 Patch400: 0001-Switch-from-orcus-0.11-to-orcus-0.12.patch @@ -2353,6 +2354,7 @@ done %changelog * Mon Mar 13 2017 Caolán McNamara - 1:5.2.6.2-4 - Resolves: rhbz#1431476 dnd has started copying instead of moving slides +- Resolves: rhbz#1431540 crash in SwDBManager releaseRef * Thu Mar 09 2017 Caolán McNamara - 1:5.2.6.2-3 - show the last gif frame when the animation ends