[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - configmgr/source

[Stephan Bergmann]

 configmgr/source/dconf.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 193d244efd0cea8011f5e6c7221dbf3b4d8459b8
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed May 9 12:15:09 2018 +0200

    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/54024
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

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