diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-08-17 08:47:19 +0100 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2021-05-10 16:33:47 +0200 |
commit | 5ac7c911d87418549d36f126c37261978f9a4cac (patch) | |
tree | 7b6d63c905e53af480a2cdf6c81860ef008a4a8c /writerfilter | |
parent | 4289cf7b780319d6a99e6b35913f453fcbdd8e9a (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')
-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 8e709bc38147..8a10802bdd99 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1500,8 +1500,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 >() ); |