diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-08-01 08:55:23 +0100 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2019-11-29 07:51:44 +0100 |
commit | de53bcfc666d6e19f2fafd72b2339a91a52a08c1 (patch) | |
tree | 10c5dfedbe2e54f39499ec0db2f63840888a3915 | |
parent | dc9cbaf8379ecd16cb37313acbd745f08a32dd62 (diff) |
forcepoint#55 invalid iterator increment
Change-Id: I151602f645a48404d93e0ae64a9e1d2a6ba2bc4b
Reviewed-on: https://gerrit.libreoffice.org/58386
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit 26300f5d4c4e6241baf8cadcfea094e7969814a5)
-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 2321e4e12907..564e0d012f2e 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.cxx @@ -3067,6 +3067,8 @@ public: if (xCurGrp) { // Move to the cell after the last cell of the current group. + if (xCurGrp->mnLength > std::distance(it, itEnd)) + throw css::lang::IllegalArgumentException(); std::advance(it, xCurGrp->mnLength); nRow += xCurGrp->mnLength; } |