[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sw/source

[Bjoern Michaelsen]

 sw/source/core/layout/frmtool.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 009c36b0bf59adadc643dc94fe30c18485f89c6d
Author: Bjoern Michaelsen <bjoern.michaelsen at libreoffice.org>
Date:   Fri Jun 15 01:05:09 2018 +0200

    tdf#117723: nullcheck the ContentAnchor before deref
    
    Change-Id: I4043efc204c8e3af8463ecd325313c99a9d61128
    Reviewed-on: https://gerrit.libreoffice.org/55839
    Reviewed-by: Björn Michaelsen <bjoern.michaelsen at libreoffice.org>
    Tested-by: Björn Michaelsen <bjoern.michaelsen at libreoffice.org>
    (cherry picked from commit d8142da066b6ee80444694e0eb6b0da9375a89c7)
    Reviewed-on: https://gerrit.libreoffice.org/55958
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index fc62869a2590..37fc4a808157 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -1171,8 +1171,9 @@ void AppendAllObjs(const SwFrameFormats* pTable, const SwFrame* pSib)
         // frames nor objects which are anchored to character bounds.
         if ((rAnch.GetAnchorId() != RndStdIds::FLY_AT_PAGE) && (rAnch.GetAnchorId() != RndStdIds::FLY_AS_CHAR))
         {
+            auto pContentAnchor = rAnch.GetContentAnchor();
             // formats in header/footer have no dependencies
-            if(pFormat->GetDoc()->IsInHeaderFooter(rAnch.GetContentAnchor()->nNode))
+            if(pContentAnchor && pFormat->GetDoc()->IsInHeaderFooter(pContentAnchor->nNode))
                 pFormat->MakeFrames();
             else
                 vFormatsToConnect.push_back(pFormat);