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

[Caolán McNamara (via logerrit)]

 writerfilter/source/dmapper/DomainMapper.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit a7214706efeba6eb057a6fcfed6ec12079bfefab
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Nov 4 21:26:39 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Nov 6 20:53:48 2019 +0100

    crashtesting: null deref on import of lp482242-3.rtf
    
    since...
    
    commit a991ad93dcd6807d0eacd11a50c2ae43a2cfb882
    Date:   Tue Oct 22 12:24:43 2019 +0200
    
        tdf#121441 improve DOCX footnote import
    
    Change-Id: I0c6b83bd1ff61b9fa3621896d59f126384530270
    Reviewed-on: https://gerrit.libreoffice.org/82045
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 37bb2fb4f5eb..6de16cdcb1a6 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3265,8 +3265,11 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, size_t len)
                 // This skips the one from the footnote area and just uses the reference one.
                 if (!m_pImpl->IsInFootOrEndnote())
                 {
-                    auto xFootnote = m_pImpl->GetFootnoteContext()->GetFootnote();
-                    xFootnote->setLabel(xFootnote->getLabel() + sText);
+                    if (PropertyMapPtr pFootnoteContext = m_pImpl->GetFootnoteContext())
+                    {
+                        auto xFootnote = pFootnoteContext->GetFootnote();
+                        xFootnote->setLabel(xFootnote->getLabel() + sText);
+                    }
                 }
                 return;
             }