diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-09-02 21:20:40 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-09-21 00:25:03 -0700 |
| commit | f0d27ad961d7b0e8dbc9f41e645b620fc3978017 (patch) | |
| tree | 1c1dcecb7739c4c62f7cb4d0b250bcb575f22235 | |
| parent | 6a03a91c4ee7fb875aa7818b026ff0fa6d72c83c (diff) | |
ofz#10189 check container size
Change-Id: Ie99e3b082795989290799d057a99b1bcff94b161
Reviewed-on: https://gerrit.libreoffice.org/59913
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 6ee76d210846b84e93420a321c7908721ffe9e43)
(cherry picked from commit 59e68800029dd91aced2daf1bae41d6ee3e4b6b8)
| -rw-r--r-- | sc/source/core/data/dptabres.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx index c20c2a94160d..f992e7aef126 100644 --- a/sc/source/core/data/dptabres.cxx +++ b/sc/source/core/data/dptabres.cxx @@ -2871,10 +2871,14 @@ void ScDPResultDimension::LateInitFrom( { if ( rParams.IsEnd( nPos ) ) return; - OSL_ENSURE( nPos <= pItemData.size(), OString::number(pItemData.size()).getStr() ); + if (nPos >= pItemData.size()) + { + SAL_WARN("sc.core", "pos " << nPos << ", but vector size is " << pItemData.size()); + return; + } + SCROW rThisData = pItemData[nPos]; ScDPDimension* pThisDim = rParams.GetDim( nPos ); ScDPLevel* pThisLevel = rParams.GetLevel( nPos ); - SCROW rThisData = pItemData[nPos]; if (!pThisDim || !pThisLevel) return; |