diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-08-17 08:47:19 +0100 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2019-08-05 14:28:51 +0200 |
| commit | ba988b5d66f3e0a8605706f09cf840e528e0f373 (patch) | |
| tree | 8b8cdac08d0a2136f68dd1f411a63c09a605fab1 | |
| parent | tdf#119224 start and end are expected to exist for the scope of this function (diff) | |
| download | core-ba988b5d66f3e0a8605706f09cf840e528e0f373.tar.gz core-ba988b5d66f3e0a8605706f09cf840e528e0f373.zip | |
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-- | 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 36aea5291757..9fa147683033 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1400,8 +1400,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 >() ); |