From 31adab13a57ce5ff67012946cccf2a5bb198add9 Mon Sep 17 00:00:00 2001 From: Caolán McNamara 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 Reviewed-by: Michael Stahl --- 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 a649e18ac6eb..950d72a8192b 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.cxx @@ -3026,6 +3026,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 v1.2.3