diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-07-28 13:58:33 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-07-28 13:59:58 +0100 |
| commit | 5de2d02806669812d43e7f23db58ab7a16373ce6 (patch) | |
| tree | 6a3a7b48538fb9b10859fbab7c38e7510c7eb5f1 | |
| parent | df9414084b46c1712dc7151f50023438c62301e2 (diff) | |
fftester: empty states stack
Change-Id: I05dfffced9a8677650a46b43f65a29e9b21c5524
| -rw-r--r-- | writerfilter/qa/cppunittests/rtftok/data/pass/popstate-1.rtf | bin | 0 -> 198 bytes | |||
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2 |
2 files changed, 2 insertions, 0 deletions
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/popstate-1.rtf b/writerfilter/qa/cppunittests/rtftok/data/pass/popstate-1.rtf Binary files differnew file mode 100644 index 000000000000..04189171327a --- /dev/null +++ b/writerfilter/qa/cppunittests/rtftok/data/pass/popstate-1.rtf diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 45be8a691d4e..b7bea75a2f8b 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -1872,6 +1872,8 @@ RTFError RTFDocumentImpl::popState() // ", dest state: " << m_aStates.top().eDestination); checkUnicode(/*bUnicode =*/ true, /*bHex =*/ true); + if (m_aStates.empty()) + return RTFError::GROUP_UNDER; RTFParserState aState(m_aStates.top()); m_bWasInFrame = aState.aFrame.inFrame(); |