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

[Caolán McNamara (via logerrit)]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 6487eb6298ce8aafaa88b773538af71bcf63d44d
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Nov 27 15:42:10 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Nov 27 21:44:46 2019 +0100

    crashtesting: failure on import of tdf113230-1.docx
    
    which is a favorite input document for crashes and assert apparently,
    this is the third time it has triggered a different problem
    
    this one is new since...
    
    commit 9fdf8c0a5cc036ea9bd1e11dd8f2c1a6e601fae2
    Author: Mike Kaganski <mike.kaganski at collabora.com>
    Date:   Sat Nov 16 16:34:25 2019 +0300
    
        Also consider saved exceptions when terminating parse
    
    Change-Id: I394b650613e8a835fe8a9f216a48864bdbc5065b
    Reviewed-on: https://gerrit.libreoffice.org/83924
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 58d7c19604fc..8eebe7869dd2 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -6384,7 +6384,11 @@ void DomainMapper_Impl::SetCurrentRedlineRevertProperties( const uno::Sequence<b
 // the context is destroyed.
 void DomainMapper_Impl::RemoveTopRedline( )
 {
-    assert( m_aRedlines.top().size( ) > 0 );
+    if (m_aRedlines.top().empty())
+    {
+        SAL_WARN("writerfilter.dmapper", "RemoveTopRedline called with empty stack");
+        throw uno::Exception("RemoveTopRedline failed", nullptr);
+    }
     m_aRedlines.top().pop_back( );
     m_currentRedline.clear();
 }