From da2fb9b40181a91590aadeca5a51a9bb1ee9b180 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Fri, 25 Oct 2019 14:37:50 +0100
Subject: ofz#18528 null deref
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 sw/source/filter/ww8/ww8par6.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
-- 
cgit