[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - writerfilter/source

[Caolán McNamara]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6286b0dd97a330624d63d7be2b3efa43711984d0
Author: Caolán McNamara <caolanm at 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/11666
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 3b55e86..87b0241 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() )
     {