summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-10-25 14:37:50 +0100
committerCaolán McNamara <caolanm@redhat.com>2019-10-25 16:20:55 +0200
commitda2fb9b40181a91590aadeca5a51a9bb1ee9b180 (patch)
treeb41d90e7bc3f48573f33ad42ef4340826e1ebda7
parent7aa8d13df68ca26352587f7772f237d614011fed (diff)
ofz#18528 null deref
Change-Id: I3eff3f9524c73ac476018dc2d3c389dc7128c6b2 Reviewed-on: https://gerrit.libreoffice.org/81504 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 112c169edcd4..d83995198272 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -2541,7 +2541,7 @@ bool SwWW8ImplReader::JoinNode(SwPaM &rPam, bool bStealAttr)
m_pPreviousNode = nullptr;
}
- if (m_xSFlyPara)
+ if (m_xSFlyPara && m_xSFlyPara->xMainTextPos)
{
// If an open apo pos is here, then clear it before
// JoinNext destroys it