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

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Fri Dec 11 10:42:03 UTC 2020


 sw/source/core/layout/flylay.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fcdd461a54a7b5703067690da8b4676321b24125
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Dec 11 08:54:06 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Dec 11 11:41:19 2020 +0100

    cid#1470586 Dereference after null check
    
    since...
    
    commit d79a578c200ff30134cf5ec7ad5c66f3e5d2d4c9
    Date:   Tue Dec 8 23:50:27 2020 +0100
    
        flylay: Modify no more
    
    Change-Id: Ief190dfb135d1bcc25004278cc68bf014554d533
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107583
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx
index 4d25fe00d1fa..2a084e67ad71 100644
--- a/sw/source/core/layout/flylay.cxx
+++ b/sw/source/core/layout/flylay.cxx
@@ -765,7 +765,7 @@ void SwFlyLayFrame::SwClientNotify(const SwModify&, const SfxHint& rHint)
             pTmpPage = static_cast<SwPageFrame*>(pTmpPage->GetNext());
             --nPagesToFlip;
         }
-        if(!nPagesToFlip)
+        if(pTmpPage && !nPagesToFlip)
         {
             // #i50432# - adjust synopsis of <PlaceFly(..)>
             pTmpPage->PlaceFly(this, nullptr);


More information about the Libreoffice-commits mailing list