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

Noel Grandin (via logerrit) logerrit at kemper.freedesktop.org
Thu Dec 3 18:38:18 UTC 2020


 sw/source/uibase/dochdl/swdtflvr.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 7898eddf919a30f03a2224adbc16db4ce4bac8e5
Author:     Noel Grandin <noel at peralex.com>
AuthorDate: Thu Dec 3 14:57:17 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Dec 3 19:37:37 2020 +0100

    fix SEGV in CppunitTest_sw_core_undo on Windows
    
    when something else changed the clipboard concurrently
     CppunitTest_sw_core_undo
    
    Change-Id: Ie0d21ed77ac38bfe2ca55e5b001e3fd09ac05493
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107159
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 9200cd67df9f..66ba7e6159b7 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -315,6 +315,8 @@ static SwDoc& lcl_GetDoc(SwDocFac & rDocFac)
 void SwTransferable::ObjectReleased()
 {
     SwModule *pMod = SW_MOD();
+    if (!pMod)
+        return;
     if( this == pMod->m_pDragDrop )
         pMod->m_pDragDrop = nullptr;
     else if( this == pMod->m_pXSelection )


More information about the Libreoffice-commits mailing list