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

Caolán McNamara caolanm at redhat.com
Thu Nov 9 11:05:59 UTC 2017


 sw/source/filter/ww8/ww8par2.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5fe262ed37ce9dc6b21b6a9cf689d3498dc1ee75
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Nov 9 09:01:42 2017 +0000

    ofz#4144 Null-dereference READ
    
    Change-Id: I480551482dbda02d86c533c5705c9c896f269450
    Reviewed-on: https://gerrit.libreoffice.org/44525
    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/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


More information about the Libreoffice-commits mailing list