diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-09-15 16:53:43 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-09-15 16:54:08 +0100 |
| commit | 48a679cbc5775a7a033dfe494c2a0a513aba9b1f (patch) | |
| tree | 6c5a21cc15fc71adc7dd7d10e72e1c55ed5e647a | |
| parent | 411e18028d39ace54096c99dafbdc4f19a2a01b5 (diff) | |
Resolves: fdo#66496 don't crash on loading specific .docx
Change-Id: I4db5dfeb0ce1494039a051f552ce3f69b2b5dae3
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableManager.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index 2afeba82e824..91c922ddfb4f 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -558,7 +558,7 @@ void DomainMapperTableManager::endLevel( ) oCurrentWidth.reset(m_aCellWidths.back()->back()); m_aCellWidths.pop_back( ); // And push it back to the right level. - if (oCurrentWidth) + if (oCurrentWidth && !m_aCellWidths.empty() && !m_aCellWidths.back()->empty()) m_aCellWidths.back()->push_back(*oCurrentWidth); m_nCell.pop_back( ); |