[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sw/source

[Noel Grandin (via logerrit)]

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

New commits:
commit 9869f2d46b163ec81858bad55373e8d4e7a7d02a
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: Fri Dec 4 20:20:27 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>
    (cherry picked from commit 7898eddf919a30f03a2224adbc16db4ce4bac8e5)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107196

diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index da8c13e04caa..9fa684a1b0fc 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -314,6 +314,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 )