diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-11-04 21:26:39 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-11-06 20:53:48 +0100 |
commit | a7214706efeba6eb057a6fcfed6ec12079bfefab (patch) | |
tree | 2e3d2afae67e64bd3e62c0a9421fafda1866a4cb | |
parent | 1b2146431a583be27518536bed19ef01861b42a0 (diff) |
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@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
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; } |