writerfilter/source/dmapper/DomainMapper_Impl.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3ebb09e0e7a0ca78e535d3c6721c2b87da37bd9d
Author: Caolán McNamara <caol...@redhat.com>
Date: Sat Sep 27 20:38:24 2014 +0100
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 <vmik...@collabora.co.uk>
Tested-by: Miklos Vajna <vmik...@collabora.co.uk>
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index d873892..075a3fa 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() )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
