diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2017-09-29 17:33:15 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2017-09-30 19:08:28 +0200 |
| commit | c3609f107b16eb888edf284f4637be6cb09234eb (patch) | |
| tree | da52e05b5cdf26d5d3a57f510f8b32d8af10a026 /xmlsecurity | |
| parent | 8a4df9376bf299beb49fe116882ffdbd10b5e02b (diff) | |
Use SAL_W/SAL_U instead of reinterpret_cast btwn wchar_t* and sal_Unicode*
This is type-safe, and allows to catch cases where a source type
is changed for some reason, but reinterpret_cast masks that
Change-Id: Ib64b6fa2e22d94a6bba890f0ccc3e20325c6f0a1
Reviewed-on: https://gerrit.libreoffice.org/42961
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx | 10 | ||||
| -rw-r--r-- | xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx | 4 |
2 files changed, 5 insertions, 9 deletions
diff --git a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx index de0eb3873f2a..fbff7f04f588 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx @@ -93,14 +93,11 @@ css::uno::Sequence< css::security::CertAltNameEntry > SAL_CALL SanExtensionImpl: } case CERT_ALT_NAME_RFC822_NAME : arrCertAltNameEntry[i].Type = ExtAltNameType_RFC822_NAME; - arrCertAltNameEntry[i].Value <<= OUString( - reinterpret_cast<sal_Unicode const *>( - pEntry->pwszRfc822Name)); + arrCertAltNameEntry[i].Value <<= OUString(SAL_U(pEntry->pwszRfc822Name)); break; case CERT_ALT_NAME_DNS_NAME : arrCertAltNameEntry[i].Type = ExtAltNameType_DNS_NAME; - arrCertAltNameEntry[i].Value <<= OUString( - reinterpret_cast<sal_Unicode const *>(pEntry->pwszDNSName)); + arrCertAltNameEntry[i].Value <<= OUString(SAL_U(pEntry->pwszDNSName)); break; case CERT_ALT_NAME_DIRECTORY_NAME : { @@ -109,8 +106,7 @@ css::uno::Sequence< css::security::CertAltNameEntry > SAL_CALL SanExtensionImpl: } case CERT_ALT_NAME_URL : arrCertAltNameEntry[i].Type = ExtAltNameType_URL; - arrCertAltNameEntry[i].Value <<= OUString( - reinterpret_cast<sal_Unicode const *>(pEntry->pwszURL)); + arrCertAltNameEntry[i].Value <<= OUString(SAL_U(pEntry->pwszURL)); break; case CERT_ALT_NAME_IP_ADDRESS : { diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx index 44b430fe939a..32bb0a82f0a8 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx @@ -299,7 +299,7 @@ static OUString get_system_name(const void *pvSystemStore, { ppwszSystemName = static_cast<LPCWSTR>(pvSystemStore); } - return reinterpret_cast<sal_Unicode const *>(ppwszSystemName); + return SAL_U(ppwszSystemName); } extern "C" BOOL WINAPI cert_enum_physical_store_callback(const void *, @@ -309,7 +309,7 @@ extern "C" BOOL WINAPI cert_enum_physical_store_callback(const void *, void *, void *) { - OUString name(reinterpret_cast<sal_Unicode const *>(pwszStoreName)); + OUString name(SAL_U(pwszStoreName)); if (dwFlags & CERT_PHYSICAL_STORE_PREDEFINED_ENUM_FLAG) name += " (implicitly created)"; SAL_INFO("xmlsecurity.xmlsec", " Physical store: " << name); |