diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-09-01 17:14:10 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-09-05 19:54:05 +0200 |
| commit | 7fc98802ecd6d9e198ae37269f10522286db987e (patch) | |
| tree | de4e1ef3e56955e9eca333c148fccbb068630c99 /registry/source/keyimpl.cxx | |
| parent | bb0c7d1615ba56966cddf1ef6caa25c08f1bd852 (diff) | |
Create OUString from storeFindData m_pszName and m_nLength
...assuming that (a) m_nLength does always reflect the actual m_pszName length,
and (b) that way of constructing an OUString from a pointer was not chosen
deliberately to cut of the string at a potential embedded NUL.
(This change is a prerequisite for making the OUString ctor taking a raw pointer
explicit.)
Change-Id: I75519825cd6b60a7c308a3697bfbfc40afb2d1c8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102076
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'registry/source/keyimpl.cxx')
| -rw-r--r-- | registry/source/keyimpl.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/registry/source/keyimpl.cxx b/registry/source/keyimpl.cxx index f3cb2d00b34e..e76512e9e19a 100644 --- a/registry/source/keyimpl.cxx +++ b/registry/source/keyimpl.cxx @@ -111,7 +111,7 @@ RegError ORegKey::openSubKeys(const OUString& keyName, RegKeyHandle** phOpenSubK { if ( iter.m_nAttrib & STORE_ATTRIB_ISDIR ) { - OUString const sSubKeyName = iter.m_pszName; + OUString const sSubKeyName(iter.m_pszName, iter.m_nLength); ORegKey* pOpenSubKey = nullptr; _ret = pKey->openKey(sSubKeyName, reinterpret_cast<RegKeyHandle*>(&pOpenSubKey)); @@ -175,7 +175,7 @@ RegError ORegKey::getKeyNames(const OUString& keyName, { if ( iter.m_nAttrib & STORE_ATTRIB_ISDIR) { - OUString const sSubKeyName = iter.m_pszName; + OUString const sSubKeyName(iter.m_pszName, iter.m_nLength); OUString sFullKeyName(pKey->getName()); if (sFullKeyName.getLength() > 1) |