diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-03-12 10:24:55 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-04-07 13:20:29 +0200 |
| commit | 79e12412d823d21bb2a0f83bf7c88ab8a92bf4d0 (patch) | |
| tree | a1ebf89925ac312fe95c0e30b1fd2efba73a6779 /writerfilter | |
| parent | 966288ba6a492772890b10a0adf33d1422ee8e85 (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/51123
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 13468a3a667c6719ccbc44c913c194fc77d8e7cf)
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 f5d2a8112ee9..b541d5716ec6 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -396,6 +396,11 @@ std::shared_ptr< vector<sal_Int32> > DomainMapperTableManager::getCurrentGrid( ) return m_aTableGrid.back( ); } +bool DomainMapperTableManager::hasCurrentSpans() const +{ + return !m_aGridSpans.empty(); +} + std::shared_ptr< vector< sal_Int32 > > DomainMapperTableManager::getCurrentSpans( ) { return m_aGridSpans.back( ); @@ -509,6 +514,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 330a20d43713..37ba0e2cc822 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx @@ -96,6 +96,7 @@ public: virtual void endOfRowAction() override; IntVectorPtr getCurrentGrid( ); + bool hasCurrentSpans() const; IntVectorPtr getCurrentSpans( ); IntVectorPtr getCurrentCellWidths( ); |