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

[Caolán McNamara]

 sw/source/core/text/txtfrm.cxx |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 2b2152038761839fdd053f69973f1328eb9581b9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jun 12 21:09:01 2018 +0100

    coverity#1436922 Dereference before null check
    
    Change-Id: I92dff76a313fb5ab8f4ffc637fc45b57e6e31554
    Reviewed-on: https://gerrit.libreoffice.org/55721
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 27f02f554370..402474391a44 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -1981,12 +1981,11 @@ void SwTextFrame::SwClientNotify(SwModify const& rModify, SfxHint const& rHint)
                     InvalidatePrt_();
                 }
 
-                const bool bMergeModify = (m_pMergedPara &&
+                if (nClear || (m_pMergedPara &&
                         (m_pMergedPara->pParaPropsNode != &rModify ||
-                         m_pMergedPara->pFirstNode != &rModify));
-                const bool bHasOldNew = pOld && pNew;
-                if ((nClear || bMergeModify) && bHasOldNew)
+                         m_pMergedPara->pFirstNode != &rModify)))
                 {
+                    assert(pOld);
                     SwAttrSetChg aOldSet( *static_cast<const SwAttrSetChg*>(pOld) );
                     SwAttrSetChg aNewSet( *static_cast<const SwAttrSetChg*>(pNew) );