From c66d6d2c303fd477a919581cb27411ed2a953344 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Nov 09 2018 12:22:02 +0000
Subject: Related: rhbz#1645905 oom with threaded calculation


---

diff --git a/0001-blacklist-svMatrix-for-calc-threaded-calculation.patch b/0001-blacklist-svMatrix-for-calc-threaded-calculation.patch
new file mode 100644
index 0000000..0cc0d1d
--- /dev/null
+++ b/0001-blacklist-svMatrix-for-calc-threaded-calculation.patch
@@ -0,0 +1,31 @@
+From f7d5881497a299688d69cc975bcae18a7d716fb2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak@collabora.com>
+Date: Thu, 8 Nov 2018 15:08:48 +0100
+Subject: [PATCH] blacklist svMatrix for calc threaded calculation
+
+If a formula contains a matrix, interpreting it will actually result
+in modifying it in some ways (e.g. ScInterpreter::PopRangeMatrix() calls
+SetErrorInterpreter() on the matrix).
+Testcase: rhbz#1645905
+
+Change-Id: I63742449ba0e4e375d6e459dc7bccd7e6b62920e
+---
+ sc/source/core/tool/token.cxx | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
+index db03b6a..494d162 100644
+--- a/sc/source/core/tool/token.cxx
++++ b/sc/source/core/tool/token.cxx
+@@ -1366,6 +1366,8 @@ void ScTokenArray::CheckForThreading( const FormulaToken& r )
+         {
+             case svExternalDoubleRef:
+             case svExternalSingleRef:
++            case svExternalName:
++            case svMatrix:
+                 SAL_INFO("sc.core.formulagroup", "opcode ocPush: variable type " << StackVarEnumToString(r.GetType())
+                     << " disables threaded calculcation of formula group");
+                 mbThreadingEnabled = false;
+-- 
+2.19.1
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 3eb8a00..4f0ca85 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -62,7 +62,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.1
-Release:        2%{?libo_prerelease}%{?dist}
+Release:        3%{?libo_prerelease}%{?dist}
 License:        (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0
 URL:            http://www.libreoffice.org/
 
@@ -269,6 +269,7 @@ Patch1: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch
 # not upstreamed
 Patch2: 0001-gtk3-only-for-3.20.patch
 Patch5: 0001-tdf-120764-Toolbar-popups-sometimes-not-showing-unde.patch
+Patch6: 0001-blacklist-svMatrix-for-calc-threaded-calculation.patch
 
 %if 0%{?rhel}
 # not upstreamed
@@ -2304,6 +2305,9 @@ done
 %{_includedir}/LibreOfficeKit
 
 %changelog
+* Fri Nov 09 2018 Caolán McNamara <caolanm@redhat.com> - 1:6.1.2.1-3
+- Related: rhbz#1645905 oom with threaded calculation
+
 * Tue Oct 30 2018 Caolán McNamara <caolanm@redhat.com> - 1:6.1.2.1-2
 - Related: rhbz#1644128 gtk tooltip problems