From 955106c4fbc3769c646beb99ed91dadff14ec2d2 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Fri, 18 Feb 2022 18:13:08 +0100 Subject: QStringConverter: make name matching locale-independent MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The existing name lookup code used C's toupper() function for case-insensitive comparison. However, that function's result depends on the current locale. Since the matcher is supposed to match the likes of "iso-8859-1" and "latin-1", matching may fail in locales, such as Turkish, where toupper(i) is İ (or i, if the former isn't representable in the current charset), but toupper(I) remains I, causing a False Negative. To fix, use the US-ASCII-only QtMiscUtils::toAsciiLower() function, which has the added advantage that it's inline. Pick-to: 6.3 6.2 Change-Id: I70613c0167d84e3dc3d282c61c716b5dd0b3e6bb Reviewed-by: Thiago Macieira --- src/corelib/text/qstringconverter.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/corelib/text/qstringconverter.cpp') diff --git a/src/corelib/text/qstringconverter.cpp b/src/corelib/text/qstringconverter.cpp index 83cbc3095a..e6c2552348 100644 --- a/src/corelib/text/qstringconverter.cpp +++ b/src/corelib/text/qstringconverter.cpp @@ -44,6 +44,7 @@ #include "private/qsimd_p.h" #include "private/qstringiterator_p.h" +#include "private/qtools_p.h" #include "qbytearraymatcher.h" #ifdef Q_OS_WIN @@ -1671,7 +1672,7 @@ static bool nameMatch(const char *a, const char *b) ++b; continue; } - if (toupper(*a) != toupper(*b)) + if (QtMiscUtils::toAsciiLower(*a) != QtMiscUtils::toAsciiLower(*b)) return false; ++a; ++b; -- cgit v1.2.3