diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-03-26 12:50:20 +0100 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2018-04-07 17:45:28 +0200 |
commit | abd300ccb25d93f9db70d7f381f088c5300109e7 (patch) | |
tree | 27cd173d8fa76493f54d564c8d15d3c0b223e2a2 /sc | |
parent | 8b055b501467a946e87c13a6e380e7e2cfcaa437 (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>
(cherry picked from commit be9e229ee147d45f110ecc1680be4068c1716c02)
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/core/data/column3.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx index 3bf6a9b0925c..3c4f8294ed19 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.cxx @@ -3104,6 +3104,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; |