[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - 2 commits - configure.ac sc/source

[Libreoffice Gerrit user]

 configure.ac                     |    2 +-
 sc/source/core/data/dptabres.cxx |    8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit f30b8c7eaf18faf954b6473379296ae2aa081f4e
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Sep 6 09:32:03 2018 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Sep 6 09:32:03 2018 +0200

    Bump version to 5.3-55
    
    Change-Id: Ib02683df7abc3df9bcb19f68d4cd9fcaf3e55031

diff --git a/configure.ac b/configure.ac
index d5cc6b659d00..8bb74a7a446e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea.
 
-AC_INIT([Collabora Office],[5.3.10.54],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[5.3.10.55],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
commit 59e68800029dd91aced2daf1bae41d6ee3e4b6b8
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Sep 2 21:20:40 2018 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Sep 6 09:30:23 2018 +0200

    ofz#10189 check container size
    
    Change-Id: Ie99e3b082795989290799d057a99b1bcff94b161
    Reviewed-on: https://gerrit.libreoffice.org/59913
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    (cherry picked from commit 6ee76d210846b84e93420a321c7908721ffe9e43)

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;