[Libreoffice-commits] .: Branch 'libreoffice-3-4-0' - xmloff/source

[Michael Meeks]

 xmloff/source/text/txtimp.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d3ac8afa8a7f05790155a3e1961fa6cf7f876062
Author: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>
Date:   Wed May 18 18:08:02 2011 +0200

    fdo#34997: fixed crash when reading malformed fieldmark tags in ODT

diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 1c1e90f..5112a5a 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -2682,7 +2682,8 @@ void XMLTextImportHelper::pushFieldCtx( ::rtl::OUString name, ::rtl::OUString ty
 
 void XMLTextImportHelper::popFieldCtx()
 {
-    m_pImpl->m_FieldStack.pop();
+    if ( !m_pImpl->m_FieldStack.empty() )
+        m_pImpl->m_FieldStack.pop();
 }
 
 void XMLTextImportHelper::addFieldParam( ::rtl::OUString name, ::rtl::OUString value )