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-14 15:27:50 +0200 |
| commit | a4730f4107ccdaf4d383f26ad9c33518fb670950 (patch) | |
| tree | 1887361fe58896b06a94370674f29e2f47c83a26 /writerfilter | |
| parent | bfbae518f471e65c3e6a65541f0d4b89f50b8544 (diff) | |
Resolves: fdo#79130 Crash in DomainMapper_Impl::CloseFieldCommand
Change-Id: Ia59e0c79ec7f2066891b78657559f41eaeb80a09
(cherry picked from commit a392a1deb0bb55f39f0232f9b3df8ad9ac9062af)
Reviewed-on: https://gerrit.libreoffice.org/11665
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
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 d87389250fe6..075a3fabe376 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -3288,7 +3288,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() ) { |