summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-03-26 12:50:20 +0100
committerMichael Stahl <Michael.Stahl@cib.de>2018-04-05 16:28:42 +0200
commitbe9e229ee147d45f110ecc1680be4068c1716c02 (patch)
tree9aa0a581cd2de29689f524622e634d3e68cdbf1c
parentd98cfa4df4e6f7391b7790c625c1f8a650514e88 (diff)
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>
-rw-r--r--sc/source/core/data/column3.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index d3e3e24d88c5..2321e4e12907 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -3113,6 +3113,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;