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

[Caolán McNamara (via logerrit)]

 sd/source/ui/func/unoaprms.cxx   |    5 ++---
 sw/source/core/layout/ftnfrm.cxx |    1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 6254ff0fb034b1728df0da4f2986639d7fd0bd16
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jul 16 12:12:18 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Jul 16 20:32:14 2019 +0200

    cid#1448514 Dereference null return value
    
    Change-Id: Idf32f7a51a57756ac620249e5a95c9e1c8d2f9d2
    Reviewed-on: https://gerrit.libreoffice.org/75716
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sd/source/ui/func/unoaprms.cxx b/sd/source/ui/func/unoaprms.cxx
index 1a30565e0f76..3bf7d98a6113 100644
--- a/sd/source/ui/func/unoaprms.cxx
+++ b/sd/source/ui/func/unoaprms.cxx
@@ -28,10 +28,9 @@ void SdAnimationPrmsUndoAction::Undo()
     if (!bInfoCreated)
     {
         SdDrawDocument* pDoc(dynamic_cast< SdDrawDocument* >(&pObject->getSdrModelFromSdrObject()));
-        if( pDoc )
+        SdAnimationInfo* pInfo = pDoc ? SdDrawDocument::GetAnimationInfo(pObject) : nullptr;
+        if (pInfo)
         {
-            SdAnimationInfo* pInfo = SdDrawDocument::GetAnimationInfo( pObject );
-
             pInfo->mbActive     = bOldActive;
             pInfo->meEffect      = eOldEffect;
             pInfo->meTextEffect  = eOldTextEffect;
commit 8c46066fd383708dbb3137647048bd5d382a6ece
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jul 16 12:10:20 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Jul 16 20:31:59 2019 +0200

    cid#1448538 Explicit null referenced
    
    Change-Id: I143fc38076a811b15c9f13bef96589a55ea649fc
    Reviewed-on: https://gerrit.libreoffice.org/75715
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index 280e6ed13d82..824bf8401b70 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -2677,6 +2677,7 @@ bool SwLayoutFrame::MoveLowerFootnotes( SwContentFrame *pStart, SwFootnoteBossFr
             pNewBoss->MoveFootnotes_( aFootnoteArr, true );
         if( pFootnoteArr )
         {
+            assert(pNewChief);
             static_cast<SwFootnoteBossFrame*>(pNewChief)->MoveFootnotes_( *pFootnoteArr, true );
             pFootnoteArr.reset();
         }