diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-08-17 08:47:19 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2019-08-22 12:12:30 +0200 |
| commit | 5a62f5dff60ed56d2c0ad72ded5bdfe59bb9a72c (patch) | |
| tree | 57e7dbbb21f5f80511c2a5696cd077d5597cca5b | |
| parent | 4a9108938b63e03e682859300da8afb63dd48321 (diff) | |
ofz#9934 null deref
Change-Id: I6833ad8a556b561a37e468da8845914cabfac4c5
Reviewed-on: https://gerrit.libreoffice.org/59249
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 4fb7390956a193e00c1b599129b89933c41f98ae)
| -rw-r--r-- | sw/qa/core/data/ooxml/fail/ofz9934-1.docx | bin | 0 -> 6722 bytes | |||
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 5 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sw/qa/core/data/ooxml/fail/ofz9934-1.docx b/sw/qa/core/data/ooxml/fail/ofz9934-1.docx Binary files differnew file mode 100644 index 000000000000..b97afaee8d3f --- /dev/null +++ b/sw/qa/core/data/ooxml/fail/ofz9934-1.docx diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 59c4659639c9..80667d52d8be 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1468,8 +1468,9 @@ void DomainMapper_Impl::appendOLE( const OUString& rStreamName, const OLEHandler if (!m_aAnchoredStack.empty()) m_aAnchoredStack.top( ).bToRemove = true; RemoveLastParagraph(); - m_aTextAppendStack.pop(); - + SAL_WARN_IF(m_aTextAppendStack.empty(), "writerfilter.dmapper", "no text stack"); + if (!m_aTextAppendStack.empty()) + m_aTextAppendStack.pop(); appendTextContent( xOLE, uno::Sequence< beans::PropertyValue >() ); |