diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-09-06 20:31:06 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-09-07 07:30:19 +0000 |
| commit | 5e9982668224345f901631d664985e823530e05a (patch) | |
| tree | 71607ff7ab12959e8ee80746ef1abc4ea0dc5a72 /writerfilter | |
| parent | 4349b6b060c95ca42f5a2ecebafe389e0e9dbb48 (diff) | |
rtf: throw early on a bad nestrow token
Change-Id: I9de8d09bce18fd1e8a145617794594a99a5f996e
Reviewed-on: https://gerrit.libreoffice.org/28708
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/rtftok/rtfdispatchsymbol.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/writerfilter/source/rtftok/rtfdispatchsymbol.cxx b/writerfilter/source/rtftok/rtfdispatchsymbol.cxx index 36f85629f988..2529492494d7 100644 --- a/writerfilter/source/rtftok/rtfdispatchsymbol.cxx +++ b/writerfilter/source/rtftok/rtfdispatchsymbol.cxx @@ -202,12 +202,12 @@ RTFError RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword) pBuffer->pRowProperties, m_nNestedCells, m_nNestedCurrentCellX); - assert(m_aStates.top().pCurrentBuffer == &m_aTableBufferStack.back()); - if (m_aTableBufferStack.size() == 1) + if (m_aTableBufferStack.size() == 1 || !m_aStates.top().pCurrentBuffer) { throw io::WrongFormatException( "mismatch between \\itap and number of \\nestrow", nullptr); } + assert(m_aStates.top().pCurrentBuffer == &m_aTableBufferStack.back()); // note: there may be several states pointing to table buffer! for (std::size_t i = 0; i < m_aStates.size(); ++i) { |