diff options
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/qa/cppunittests/rtftok/data/fail/popstate-1.rtf | bin | 0 -> 198 bytes | |||
-rw-r--r-- | writerfilter/qa/cppunittests/rtftok/data/fail/popstate-2.rtf | 1 | ||||
-rw-r--r-- | writerfilter/qa/cppunittests/rtftok/testrtftok.cxx | 4 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.hxx | 31 |
4 files changed, 32 insertions, 4 deletions
diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/popstate-1.rtf b/writerfilter/qa/cppunittests/rtftok/data/fail/popstate-1.rtf Binary files differnew file mode 100644 index 000000000000..04189171327a --- /dev/null +++ b/writerfilter/qa/cppunittests/rtftok/data/fail/popstate-1.rtf diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/popstate-2.rtf b/writerfilter/qa/cppunittests/rtftok/data/fail/popstate-2.rtf new file mode 100644 index 000000000000..273bb135c9d0 --- /dev/null +++ b/writerfilter/qa/cppunittests/rtftok/data/fail/popstate-2.rtf @@ -0,0 +1 @@ +\\rttt\noTidqtpdp{\"pb18}\p{\"ptxtbr } diff --git a/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx b/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx index 8c31f92abe9a..b84f4347e1d1 100644 --- a/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx +++ b/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx @@ -74,6 +74,10 @@ bool RtfTest::load(const OUString&, } throw; } + catch (const std::exception&) + { + return false; + } } void RtfTest::test() diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx index d1f261d9f486..393074a7acda 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx @@ -310,19 +310,42 @@ public: }; /// An RTF stack is similar to std::stack, except that it has an operator[]. -struct RTFStack : public std::deque<RTFParserState> +struct RTFStack { +private: + std::deque<RTFParserState> m_Impl; +public: RTFParserState& top() { - return back(); + if (m_Impl.empty()) + throw std::out_of_range("empty rtf state stack"); + return m_Impl.back(); } void pop() { - return pop_back(); + if (m_Impl.empty()) + throw std::out_of_range("empty rtf state stack"); + return m_Impl.pop_back(); } void push(RTFParserState const& rState) { - return push_back(rState); + return m_Impl.push_back(rState); + } + bool empty() const + { + return m_Impl.empty(); + } + size_t size() const + { + return m_Impl.size(); + } + const RTFParserState& operator[](size_t nIndex) const + { + return m_Impl[nIndex]; + } + RTFParserState& operator[](size_t nIndex) + { + return m_Impl[nIndex]; } }; |