[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sc/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Mon Jun 15 15:58:00 UTC 2020


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

New commits:
commit 779b9823dcff7ecfe6a1f4c5bb75cbecec947b69
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Jun 15 14:51:48 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Jun 15 17:57:30 2020 +0200

    rhbz#1847031 null-deref
    
    Change-Id: Ic9327788ebf49ac1ab0d3463f2f1e4d87ef14cb3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96338
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index 912f956f930f..5a81a24a1fa4 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