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

[Caolán McNamara (via logerrit)]

 sw/source/filter/ww8/ww8graf.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a0d4955ba650ace35b7fd411a9670be1032e6982
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Apr 10 12:42:49 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Apr 10 17:56:47 2021 +0200

    cid#1476017 Dereference after null check
    
    Change-Id: Icd991bb20dc3aa96041f6a432bddf1bb2775f371
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113907
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 07ff4d41f730..cae7553eef51 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -3181,9 +3181,9 @@ SwFlyFrameFormat* SwWW8ImplReader::ImportReplaceableDrawables( SdrObject* &rpObj
         if (!rpOurNewObject->IsInserted())
         {
             // pass information, if object is in page header|footer to method.
-            m_xWWZOrder->InsertEscherObject( rpOurNewObject, pF->nSpId,
-                                             pRecord->bDrawHell,
-                                           m_bIsHeader || m_bIsFooter );
+            m_xWWZOrder->InsertEscherObject(rpOurNewObject, pF->nSpId,
+                                            pRecord && pRecord->bDrawHell,
+                                            m_bIsHeader || m_bIsFooter);
         }
     }
     return pRetFrameFormat;