[Libreoffice-commits] core.git: sw/qa writerfilter/source

[Libreoffice Gerrit user]

 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 49d08ac52b06b2f690ebcb1fd70bf0dc7bcd16e1
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Aug 17 08:47:19 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Aug 17 13:36:42 2018 +0200

    ofz#9934 null deref
    
    Change-Id: I6833ad8a556b561a37e468da8845914cabfac4c5
    Reviewed-on: https://gerrit.libreoffice.org/59246
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

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 5e58dd60f178..0091f40aff28 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1771,8 +1771,9 @@ void DomainMapper_Impl::appendOLE( const OUString& rStreamName, const std::share
         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 >() );