summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-11-09 09:01:42 +0000
committerCaolán McNamara <caolanm@redhat.com>2017-11-09 12:05:29 +0100
commit5fe262ed37ce9dc6b21b6a9cf689d3498dc1ee75 (patch)
tree532e65b0500c850112182058157a40c2d8dc6239
parentd6ee89bc8882b13332275a156bfa8a56b5cf81e9 (diff)
ofz#4144 Null-dereference READ
Change-Id: I480551482dbda02d86c533c5705c9c896f269450 Reviewed-on: https://gerrit.libreoffice.org/44525 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sw/source/filter/ww8/ww8par2.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 4329ac64eabd..dfc1eaddb984 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -2565,8 +2565,8 @@ void WW8TabDesc::CreateSwTable()
if (text::HoriOrientation::LEFT_AND_WIDTH == m_eOri)
{
- if (!m_pIo->m_nInTable && m_pIo->InLocalApo() && m_pIo->m_xSFlyPara->pFlyFormat &&
- GetMinLeft())
+ if (!m_pIo->m_nInTable && m_pIo->InLocalApo() && m_pIo->m_xSFlyPara &&
+ m_pIo->m_xSFlyPara->pFlyFormat && GetMinLeft())
{
//If we are inside a frame and we have a border, the frames
//placement does not consider the tables border, which word