sw/qa/core/data/ooxml/fail/ofz9934-1.docx |binary
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 5 +++--
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 4fb7390956a193e00c1b599129b89933c41f98ae
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Aug 17 08:47:19 2018 +0100
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Mon Aug 20 12:16:10 2018 +0200
ofz#9934 null deref
Change-Id: I6833ad8a556b561a37e468da8845914cabfac4c5
Reviewed-on: https://gerrit.libreoffice.org/59249
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@cib.de>
diff --git a/sw/qa/core/data/ooxml/fail/ofz9934-1.docx
b/sw/qa/core/data/ooxml/fail/ofz9934-1.docx
new file mode 100644
index 000000000000..b97afaee8d3f
Binary files /dev/null and b/sw/qa/core/data/ooxml/fail/ofz9934-1.docx differ
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index d2289c25fa9b..aff0159140e6 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1610,8 +1610,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 >() );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
