diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-03-12 10:24:55 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-03-19 10:18:57 +0100 |
| commit | 1f3a4ecb7db3c4d2c44750c77b51b7cfcde1ab1f (patch) | |
| tree | 8f88911d6b02646cccbbb83f127fdfc2a9a338d4 /writerfilter | |
| parent | c419a729dcfd62dd6f971445dc526c6e469dde42 (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/51122
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 874ce3384be2e11a7fd0ed02bf7d05e0ab5bea79)
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 b101ec64dc0c..60e1792b56dd 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -386,6 +386,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( ); @@ -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 77db084634dc..f19eb467e12e 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx @@ -95,6 +95,7 @@ public: virtual void endOfRowAction() override; IntVectorPtr getCurrentGrid( ); + bool hasCurrentSpans() const; IntVectorPtr getCurrentSpans( ); IntVectorPtr getCurrentCellWidths( ); |