Add fallback in case of locale initialization failure
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18282)
diff --git a/crypto/o_str.c b/crypto/o_str.c
index ede2ee4..d91ac8f 100644
--- a/crypto/o_str.c
+++ b/crypto/o_str.c
@@ -349,8 +349,8 @@
#ifndef OPENSSL_NO_LOCALE
static locale_t loc;
-static void *ossl_c_locale(void) {
- return (void *)loc;
+static locale_t ossl_c_locale(void) {
+ return loc;
}
int ossl_init_casecmp_int(void) {
@@ -359,21 +359,32 @@
# else
loc = newlocale(LC_COLLATE_MASK, "C", (locale_t) 0);
# endif
- return (loc == (locale_t) 0) ? 0 : 1;
+ return (loc == (locale_t)0) ? 0 : 1;
}
void ossl_deinit_casecmp(void) {
freelocale(loc);
+ loc = (locale_t)0;
}
int OPENSSL_strcasecmp(const char *s1, const char *s2)
{
- return strcasecmp_l(s1, s2, (locale_t)ossl_c_locale());
+ locale_t l = ossl_c_locale();
+
+ /* Fallback in case of locale initialization failure */
+ if (l == (locale_t)0)
+ return strcasecmp(s1, s2);
+ return strcasecmp_l(s1, s2, l);
}
int OPENSSL_strncasecmp(const char *s1, const char *s2, size_t n)
{
- return strncasecmp_l(s1, s2, n, (locale_t)ossl_c_locale());
+ locale_t l = ossl_c_locale();
+
+ /* Fallback in case of locale initialization failure */
+ if (l == (locale_t)0)
+ return strncasecmp(s1, s2, n);
+ return strncasecmp_l(s1, s2, n, l);
}
#else
int ossl_init_casecmp_int(void) {
diff --git a/include/internal/e_os.h b/include/internal/e_os.h
index fd45d20..9e2f140 100644
--- a/include/internal/e_os.h
+++ b/include/internal/e_os.h
@@ -421,6 +421,7 @@
# define strcasecmp_l _stricmp_l
# define strncasecmp_l _strnicmp_l
# define strcasecmp _stricmp
+# define strncasecmp _strnicmp
# elif !defined(_POSIX_C_SOURCE) || _POSIX_C_SOURCE < 200809L \
|| defined(OPENSSL_SYS_TANDEM)
# ifndef OPENSSL_NO_LOCALE