summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorMarco Cecchetti <marco.cecchetti@collabora.com>2016-05-31 10:42:06 +0200
committerJan Holesovsky <kendy@collabora.com>2016-05-31 17:01:12 +0200
commitb933f9b817d8449a87841e413cbe96ce31a63555 (patch)
treea6f528b003077eb4a233c6429d03d675973350b1 /sc
parentb75670009ca885869aa6b58ac33766808e23653c (diff)
tdf#84411 - OpenCL: S/W interpreter throws std::out_of_range error
The problem is that in an array fragment, row start can be beyond data row end. Change-Id: I33658c87c21d1be237f4675241e3eabdd4ec7058
Diffstat (limited to 'sc')
-rw-r--r--sc/source/core/tool/scmatrix.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 1689809bc4e2..4aa0993f365a 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -3362,6 +3362,10 @@ void ScVectorRefMatrix::ensureFullMatrix()
size_t nRowSize = mnRowSize;
size_t nRowEnd = mnRowStart + mnRowSize;
size_t nDataRowEnd = mpToken->GetArrayLength();
+
+ if (mnRowStart >= nDataRowEnd)
+ return;
+
if (nRowEnd > nDataRowEnd)
{
// Data array is shorter than the row size of the reference. Truncate