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:33:09 +0200 |
| commit | 60a4793cb9aadef780025bd739f81623bdf5db02 (patch) | |
| tree | 64a31c45d17d84a26bd08abd8e56c0142a613764 /writerfilter/source | |
| parent | f007042cceeb9386c8e9ada31aa7f6e92dae3259 (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)
Diffstat (limited to 'writerfilter/source')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
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 >() ); |