summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorC├ędric Bosdonnat <cedric.bosdonnat.ooo@free.fr>2011-05-18 18:08:02 +0200
committerMichael Meeks <michael.meeks@novell.com>2011-05-18 20:36:57 +0100
commitc09adb8b98761f7644af6793dac968c3f984b081 (patch)
tree15d71454d53df95653109361baa66b7099a56fc4
parent952801a7d56368301cd2bf21b6f9afe946e8e8dd (diff)
fdo#34997: fixed crash when reading malformed fieldmark tags in ODT
-rw-r--r--xmloff/source/text/txtimp.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 1c1e90ff52..5112a5a6b4 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 )