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

[Caolán McNamara (via logerrit)]

 sw/source/filter/ww8/ww8par6.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit da2fb9b40181a91590aadeca5a51a9bb1ee9b180
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Oct 25 14:37:50 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Oct 25 16:20:55 2019 +0200

    ofz#18528 null deref
    
    Change-Id: I3eff3f9524c73ac476018dc2d3c389dc7128c6b2
    Reviewed-on: https://gerrit.libreoffice.org/81504
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

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