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

[Caolán McNamara (via logerrit)]

 cui/source/dialogs/SpellDialog.cxx |    1 +
 sw/source/filter/ww8/ww8scan.cxx   |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 00af4b1e5157d1a7f71da168dc7b48707e9113cd
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jul 24 09:02:41 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Jul 24 14:25:29 2019 +0200

    cid#1451635 silence Dereference after null check
    
    Change-Id: Ie5978be908647fe1215e1517a2bf638c7936dae2
    Reviewed-on: https://gerrit.libreoffice.org/76225
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 9c6e90b74c25..dc2a9b4ef83e 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -1483,6 +1483,7 @@ bool SentenceEditWindow_Impl::KeyInput(const KeyEvent& rKeyEvt)
                 if (pErrorAttrib->nStart != m_nErrorStart || pErrorAttrib->nEnd != m_nErrorEnd)
                 {
                     std::unique_ptr<SfxPoolItem> xNewError(pErrorAttrib->pAttr->Clone());
+                    assert(pErrorAttr);
                     m_xEditEngine->RemoveAttribs(ESelection(0, pErrorAttr->nStart, 0, pErrorAttr->nEnd), false, EE_CHAR_GRABBAG);
                     SetAttrib(*xNewError, m_nErrorStart, m_nErrorEnd);
                 }
commit b055dda3c82086f5c633403bd952209d6ed4288f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jul 24 10:05:59 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Jul 24 14:25:08 2019 +0200

    cid#1448539 try silence Double free
    
    Change-Id: I05f30f33acc06325eba59965a84fa43749d6f394
    Reviewed-on: https://gerrit.libreoffice.org/76230
    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/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 19e0d81e7850..196c0eef3936 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -2859,13 +2859,14 @@ WW8PLCFx_Fc_FKP::WW8Fkp::Entry&
     mnIStd = rEntry.mnIStd;
     mbMustDelete = rEntry.mbMustDelete;
 
-    if (mbMustDelete)
+    if (rEntry.mbMustDelete)
     {
         mpData = new sal_uInt8[mnLen];
         memcpy(mpData, rEntry.mpData, mnLen);
     }
     else
         mpData = rEntry.mpData;
+
     return *this;
 }