diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-08-01 08:55:23 +0100 |
---|---|---|
committer | Michael Stahl <Michael.Stahl@cib.de> | 2019-08-02 18:11:33 +0200 |
commit | 87949b8e6e9527d88b7d1f297a662aae8252f057 (patch) | |
tree | d3acdbd9001010d6640eeb0e6fc2e1dea265eb19 | |
parent | forcepoint#57 sanity check stream signature size (diff) | |
download | core-87949b8e6e9527d88b7d1f297a662aae8252f057.tar.gz core-87949b8e6e9527d88b7d1f297a662aae8252f057.zip |
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 712ca69fbe10..950d72a8192b 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.cxx @@ -2978,6 +2978,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; } |