diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2013-06-11 16:14:50 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2013-06-11 16:25:21 +0200 |
commit | a4fee33b23fbe68ba4b1a0701c4bfb2bec79e8b5 (patch) | |
tree | f1403460ffc94341e22eb63dd74ce8d4fb585e6f | |
parent | e75a8b8eff811a1bfdca59fd1eb3e64bea1b02c1 (diff) |
abi#4817 attempt to access an element in an empty container
Change-Id: Ic51ef8b3db182dd34195c9bb808170d20953d406
-rw-r--r-- | writerfilter/qa/cppunittests/rtftok/data/pass/abi4817.rtf | 6 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/abi4817.rtf b/writerfilter/qa/cppunittests/rtftok/data/pass/abi4817.rtf new file mode 100644 index 000000000000..58d88f5fff5b --- /dev/null +++ b/writerfilter/qa/cppunittests/rtftok/data/pass/abi4817.rtf @@ -0,0 +1,6 @@ +{\rtf1 +\super +{ +\par +\par } +} diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index b2179c40ce48..c70447efe43f 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -4591,7 +4591,7 @@ int RTFDocumentImpl::popState() if (aState.pCurrentBuffer == &m_aSuperBuffer) { - OSL_ASSERT(m_aStates.top().pCurrentBuffer == 0); + OSL_ASSERT(!m_aStates.empty() && m_aStates.top().pCurrentBuffer == 0); if (!m_bHasFootnote) replayBuffer(m_aSuperBuffer); |