From cc8eee1453b9e4b294c6ca89868504abfd1504a4 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Mon, 26 Mar 2018 12:50:20 +0100
Subject: forcepoint #31 check validity of another group range

Change-Id: I82ff3e47a033c91581b108e1685b1ff4d5865895
Reviewed-on: https://gerrit.libreoffice.org/51883
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit be9e229ee147d45f110ecc1680be4068c1716c02)
---
 sc/source/core/data/column3.cxx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 473b6bccce23..75123a3765cf 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -3109,6 +3109,8 @@ public:
             {
                 // Previous cell is a regular cell and current cell is a group.
                 nRow += xCurGrp->mnLength;
+                if (xCurGrp->mnLength > std::distance(it, itEnd))
+                    throw css::lang::IllegalArgumentException();
                 std::advance(it, xCurGrp->mnLength);
                 pPrev->SetCellGroup(xCurGrp);
                 xCurGrp->mpTopCell = pPrev;
-- 
cgit