sw/source/core/layout/frmtool.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
New commits: commit b1d679a1b06de087fe2a1af079e0c6c46473c0e3 Author: Bjoern Michaelsen <bjoern.michael...@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.michael...@libreoffice.org> Tested-by: Björn Michaelsen <bjoern.michael...@libreoffice.org> (cherry picked from commit d8142da066b6ee80444694e0eb6b0da9375a89c7) Reviewed-on: https://gerrit.libreoffice.org/55953 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.st...@cib.de> diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index 2276f7fa2b99..936c4e02dc40 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -1080,8 +1080,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); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits