[Libreoffice-commits] core.git: configmgr/source

[Mike Kaganski]

 configmgr/source/winreg.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 05d15643c40b571059f8a9474cbf0c5056e40873
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Thu Nov 2 11:01:59 2017 +0300

    Winreg configuration layer: don't assert on user input
    
    Change-Id: I1314e37315450ead3bf131ed3fabd9351a88a4e5
    Reviewed-on: https://gerrit.libreoffice.org/44191
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/configmgr/source/winreg.cxx b/configmgr/source/winreg.cxx
index ea24c0ebacb4..e9c6e8359510 100644
--- a/configmgr/source/winreg.cxx
+++ b/configmgr/source/winreg.cxx
@@ -167,7 +167,8 @@ void dumpWindowsRegistryKey(HKEY hKey, OUString const & aKeyName, TempFile &aFil
                 }
             }
             // type and external are mutually exclusive
-            assert(aType.isEmpty() || !bExternal);
+            if (bExternal)
+                aType.clear();
 
             sal_Int32 aLastSeparator = aKeyName.lastIndexOf('\\');
             OUString aPathAndNodes = aKeyName.copy(0, aLastSeparator);