From 5de2d02806669812d43e7f23db58ab7a16373ce6 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 28 Jul 2016 13:58:33 +0100 Subject: fftester: empty states stack Change-Id: I05dfffced9a8677650a46b43f65a29e9b21c5524 --- .../qa/cppunittests/rtftok/data/pass/popstate-1.rtf | Bin 0 -> 198 bytes writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2 ++ 2 files changed, 2 insertions(+) create mode 100644 writerfilter/qa/cppunittests/rtftok/data/pass/popstate-1.rtf diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/popstate-1.rtf b/writerfilter/qa/cppunittests/rtftok/data/pass/popstate-1.rtf new file mode 100644 index 000000000000..04189171327a Binary files /dev/null and b/writerfilter/qa/cppunittests/rtftok/data/pass/popstate-1.rtf differ 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(); -- cgit v1.2.3