From 59e68800029dd91aced2daf1bae41d6ee3e4b6b8 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sun, 2 Sep 2018 21:20:40 +0100 Subject: ofz#10189 check container size Change-Id: Ie99e3b082795989290799d057a99b1bcff94b161 Reviewed-on: https://gerrit.libreoffice.org/59913 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit 6ee76d210846b84e93420a321c7908721ffe9e43) --- sc/source/core/data/dptabres.cxx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx index b62c88b4af8d..86a028939ef1 100644 --- a/sc/source/core/data/dptabres.cxx +++ b/sc/source/core/data/dptabres.cxx @@ -2869,10 +2869,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; -- cgit v1.2.3