diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-09-27 20:38:24 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-10-03 10:32:29 +0200 |
| commit | 2374173a331db79425ffe28ed0765b16817e5d6b (patch) | |
| tree | 09e277b83f85c156bb59a588308f1a194f6d9949 /writerfilter | |
| parent | 142527fff381c3269ca05e99b9fb8a6fb7ab1b6c (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 37152f647974..f564407d9378 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -3088,7 +3088,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() ) { |