[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sc/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Tue Jun 16 09:16:10 UTC 2020


 sc/source/ui/app/transobj.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8718d243edc9400b0e0131b096702af8d33df327
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Jun 15 14:51:48 2020 +0100
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Tue Jun 16 11:15:40 2020 +0200

    rhbz#1847031 null-deref
    
    Change-Id: Ic9327788ebf49ac1ab0d3463f2f1e4d87ef14cb3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96339
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index 88f80d77f272..2730ec0c1f93 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -179,7 +179,7 @@ ScTransferObj::~ScTransferObj()
     SolarMutexGuard aSolarGuard;
 
     ScModule* pScMod = SC_MOD();
-    if ( pScMod->GetDragData().pCellTransfer == this )
+    if (pScMod && pScMod->GetDragData().pCellTransfer == this)
     {
         OSL_FAIL("ScTransferObj wasn't released");
         pScMod->ResetDragObject();


More information about the Libreoffice-commits mailing list