diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-11-27 15:42:10 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-11-27 21:45:00 +0100 |
| commit | 039a66e911ce6e2b339774b438b7bd8c46e5a592 (patch) | |
| tree | dcdab686a8a3a59d74e530d83dd0af261196a757 /writerfilter | |
| parent | c8b79a31317877265b449b4d0dc5663dfcae5ce3 (diff) | |
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@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/83925
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index a77a241fb7dc..fe66d4ddadb9 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -6315,7 +6315,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(); } |