summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2013-11-26 15:37:48 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2013-11-26 15:50:22 +0100
commitfee379666a068d27c25e0ecfd763e85b0f3c59f2 (patch)
tree7574f55a689ef92eb7a29b73a2ed077ac64e67b7 /oox
parentc7069898e18f26c132c80cc53f69eb9fb934c154 (diff)
oox: avoid crash in ContextHandler2Helper::processCollectedChars()
Change-Id: Ie70c9914745364c7f2beb3cb84a610ec919a950c
Diffstat (limited to 'oox')
-rw-r--r--oox/source/core/contexthandler2.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/oox/source/core/contexthandler2.cxx b/oox/source/core/contexthandler2.cxx
index 9ac94e8fb1f4..9c7a820ec613 100644
--- a/oox/source/core/contexthandler2.cxx
+++ b/oox/source/core/contexthandler2.cxx
@@ -166,6 +166,8 @@ void ContextHandler2Helper::popElementInfo()
void ContextHandler2Helper::processCollectedChars()
{
OSL_ENSURE( !mxContextStack->empty(), "ContextHandler2Helper::processCollectedChars - no context info" );
+ if (mxContextStack->empty())
+ return;
ElementInfo& rInfo = mxContextStack->back();
if( !rInfo.maChars.isEmpty() )
{