summaryrefslogtreecommitdiff
path: root/xmloff
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
commit8eeea83cd2173cf19aeaea2bbc4b357432a092d2 (patch)
treeb890380dec89ea3571af5f6a8d46b4f396c49895 /xmloff
parentf7f1b2c63eda6f96467c28bff48056a515f3e2ce (diff)
fdo#34997: fixed crash when reading malformed fieldmark tags in ODT
Diffstat (limited to 'xmloff')
-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 5a80d19b1096..2a7abbf088ee 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 )