diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-03-12 10:24:55 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-03-12 22:06:11 +0100 |
commit | 57a1d2ce7da74efcdd2c13c8d2dd23cab1de3461 (patch) | |
tree | 38d32c1755c14d09ff981808142f77d6fc98a040 /writerfilter | |
parent | b718c29265826af8e15eafc649443602624875a1 (diff) |
forcepoint #24 back() on empty vector
Thanks to Antti Levomäki and Christian Jalio from Forcepoint.
Change-Id: Idb6723b53a1ae8aaca80847bfe643bc4abaedd21
Reviewed-on: https://gerrit.libreoffice.org/51121
Tested-by: Jenkins <ci@libreoffice.org>
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/dmapper/DomainMapperTableManager.cxx | 7 | ||||
-rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableManager.hxx | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index 93b4d9266db4..613282e39683 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -386,6 +386,11 @@ std::shared_ptr< vector<sal_Int32> > const & DomainMapperTableManager::getCurren return m_aTableGrid.back( ); } +bool DomainMapperTableManager::hasCurrentSpans() const +{ + return !m_aGridSpans.empty(); +} + std::shared_ptr< vector< sal_Int32 > > const & DomainMapperTableManager::getCurrentSpans( ) { return m_aGridSpans.back( ); @@ -499,6 +504,8 @@ void DomainMapperTableManager::endOfCellAction() TagLogger::getInstance().element("endOFCellAction"); #endif + if (!hasCurrentSpans()) + throw std::out_of_range("empty spans"); getCurrentSpans()->push_back(m_nGridSpan); m_nGridSpan = 1; ++m_nCell.back( ); diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx b/writerfilter/source/dmapper/DomainMapperTableManager.hxx index 4729c7c65b69..538fa94cc4d2 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx @@ -95,6 +95,7 @@ public: virtual void endOfRowAction() override; IntVectorPtr const & getCurrentGrid( ); + bool hasCurrentSpans() const; IntVectorPtr const & getCurrentSpans( ); IntVectorPtr const & getCurrentCellWidths( ); |