From 05d15643c40b571059f8a9474cbf0c5056e40873 Mon Sep 17 00:00:00 2001
From: Mike Kaganski <mike.kaganski@collabora.com>
Date: Thu, 2 Nov 2017 11:01:59 +0300
Subject: Winreg configuration layer: don't assert on user input

Change-Id: I1314e37315450ead3bf131ed3fabd9351a88a4e5
Reviewed-on: https://gerrit.libreoffice.org/44191
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
---
 configmgr/source/winreg.cxx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'configmgr')

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);
-- 
cgit