diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2017-11-02 11:01:59 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2017-11-02 21:30:28 +0100 |
| commit | dff771fb077d4182a9eb27af6f840dc821c94722 (patch) | |
| tree | 8f21e9d033724f866e02aaeb438cec78bbe3cd51 /configmgr | |
| parent | 70179a6e2c888bd649deea4b2b13aedde607b518 (diff) | |
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>
(cherry picked from commit 05d15643c40b571059f8a9474cbf0c5056e40873)
Reviewed-on: https://gerrit.libreoffice.org/44236
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/source/winreg.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configmgr/source/winreg.cxx b/configmgr/source/winreg.cxx index 8aeec9b12703..be625eb99283 100644 --- a/configmgr/source/winreg.cxx +++ b/configmgr/source/winreg.cxx @@ -25,7 +25,6 @@ #include <sal/log.hxx> #include <osl/file.h> #include <osl/file.hxx> -#include <assert.h> #include "winreg.hxx" #include "writemodfile.hxx" @@ -160,7 +159,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); |