sc/source/core/tool/scmatrix.cxx | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit a97f9c5790b4751098b0c3f78a387fbff36582a6
Author: Marco Cecchetti <marco.cecche...@collabora.com>
Date: Tue May 31 10:42:06 2016 +0200
tdf#84411 - OpenCL: S/W interpreter throws std::out_of_range error
The problem is that in a array fragment, row start can be beyond data
row end.
Change-Id: I33658c87c21d1be237f4675241e3eabdd4ec7058
Reviewed-on: https://gerrit.libreoffice.org/25728
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
Tested-by: Michael Meeks <michael.me...@collabora.com>
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 47652d2..c70bf71 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -3065,6 +3065,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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
