diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-09-27 20:38:24 +0100 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2014-09-30 20:25:50 +0000 |
commit | 6286b0dd97a330624d63d7be2b3efa43711984d0 (patch) | |
tree | 84d6804e1a82e848e42cb1cafa804a09a49f9268 /writerfilter | |
parent | efd7c456fffc77a6bb2e85d3d89f98ccd4a0faba (diff) |
Resolves: fdo#79130 Crash in DomainMapper_Impl::CloseFieldCommand
Change-Id: Ia59e0c79ec7f2066891b78657559f41eaeb80a09
(cherry picked from commit a392a1deb0bb55f39f0232f9b3df8ad9ac9062af)
Reviewed-on: https://gerrit.libreoffice.org/11666
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 3b55e8661377..87b0241cbfdb 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -3062,7 +3062,7 @@ void DomainMapper_Impl::CloseFieldCommand() dmapper_logger->element("closeFieldCommand"); #endif - FieldContextPtr pContext = m_aFieldStack.top(); + FieldContextPtr pContext = m_aFieldStack.empty() ? NULL : m_aFieldStack.top(); OSL_ENSURE( pContext.get(), "no field context available"); if( pContext.get() ) { |