From 87b6a51d5dfcf0a61851e9848d8e51da84b34e00 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 18 Jun 2022 01:16:10 +0300 Subject: [PATCH] keep references to QByteArray objects in QString::localeAwareCompare_helper() Signed-off-by: Ivailo Monev --- src/core/tools/qstring.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/core/tools/qstring.cpp b/src/core/tools/qstring.cpp index 2a3bc7b0c..8b4890308 100644 --- a/src/core/tools/qstring.cpp +++ b/src/core/tools/qstring.cpp @@ -4165,9 +4165,10 @@ int QString::localeAwareCompare_helper(const QChar *data1, int length1, return res; } // else fall through + const QByteArray databytes1 = toLocal8Bit_helper(data1, length1); + const QByteArray databytes2 = toLocal8Bit_helper(data2, length2); // declared in - int delta = strcoll(toLocal8Bit_helper(data1, length1).constData(), - toLocal8Bit_helper(data2, length2).constData()); + int delta = strcoll(databytes1.constData(), databytes2.constData()); if (delta == 0) delta = ucstrcmp(data1, length1, data2, length2); return delta;