From 42b07ba3ce7b26a026967e259418f00e72444c52 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 9 May 2018 12:30:37 +0200 Subject: [PATCH] Fix a potential crash when using the dconf configuration backend --- ...mplate-clone-in-configmgr-dconf-mode.patch | 29 +++++++++++++++++++ libreoffice.spec | 6 +++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 0001-Missing-template-clone-in-configmgr-dconf-mode.patch diff --git a/0001-Missing-template-clone-in-configmgr-dconf-mode.patch b/0001-Missing-template-clone-in-configmgr-dconf-mode.patch new file mode 100644 index 0000000..9605075 --- /dev/null +++ b/0001-Missing-template-clone-in-configmgr-dconf-mode.patch @@ -0,0 +1,29 @@ +From 08232c1eababe3c12c94eb1eb272bd363693450e Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann +Date: Wed, 9 May 2018 12:15:09 +0200 +Subject: [PATCH] Missing template clone() in configmgr dconf mode + +...that could cause infinite recursion, e.g. when an erroneously modified +/org.openoffice.ucb.Hierarchy/Entry template (which recursively has children of +the same template type) is later used to instantiate a new set member. + +Change-Id: I7b9e55fa1c92979aed98b9f23f4432600afffed4 +--- + configmgr/source/dconf.cxx | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configmgr/source/dconf.cxx b/configmgr/source/dconf.cxx +index 22c80841addf..642e37ec0257 100644 +--- a/configmgr/source/dconf.cxx ++++ b/configmgr/source/dconf.cxx +@@ -938,6 +938,7 @@ void readDir( + << templ); + continue; + } ++ member = member->clone(true); + break; + default: + assert(false); // cannot happen +-- +2.14.3 + diff --git a/libreoffice.spec b/libreoffice.spec index 38185e2..41cc866 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -62,7 +62,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.2 -Release: 9%{?libo_prerelease}%{?dist} +Release: 10%{?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/ @@ -277,6 +277,7 @@ Patch9: 0001-Related-tdf-116951-rhbz-1569331-end-should-be-in-ter.patch Patch10: 0001-Resolves-tdf-116951-rhbz-1569331-start-is-G_MAXINT.patch Patch11: 0001-set-Referer-on-link-mediadescriptor.patch Patch12: 0001-Resolves-tdf-117413-char-doubling-appearing-under-X-.patch +Patch13: 0001-Missing-template-clone-in-configmgr-dconf-mode.patch %if 0%{?rhel} # not upstreamed @@ -2325,6 +2326,9 @@ done %{_includedir}/LibreOfficeKit %changelog +* Wed May 9 2018 Stephan Bergmann - 1:6.0.3.2-10 +- Fix a potential crash when using the dconf configuration backend + * Sat May 5 2018 Caolán McNamara - 1:6.0.3.2-9 - tdf#117413 char doubling in calc under X