summaryrefslogtreecommitdiff
path: root/configmgr/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-05-09 12:15:09 +0200
committerStephan Bergmann <sbergman@redhat.com>2018-05-09 14:51:56 +0200
commit536bd91e1910ea4cc9aeea123b00785b76063984 (patch)
treefc0bf8cf10ec8302a5ff10fa23c2775b3bb51f7c /configmgr/source
parent79fa6ac73caeae089d255c6b8629075364b4a477 (diff)
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 Reviewed-on: https://gerrit.libreoffice.org/54023 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'configmgr/source')
-rw-r--r--configmgr/source/dconf.cxx1
1 files changed, 1 insertions, 0 deletions
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