1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QString::fromUtf16: use qustrlen

Browse Source 
We have it.

Pick-to: 6.2
Change-Id: Iccb47e5527544b6fbd75fffd16b901fe4d2920a7
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Thiago Macieira 2021-11-19 09:15:31 -08:00
parent fd8f81f385
commit 09c58614db
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/corelib/text/qstring.cpp
View File

@ -5462,11 +5462,8 @@ QString QString::fromUtf16(const char16_t *unicode, qsizetype size)
{ {
if (!unicode) if (!unicode)
return QString(); return QString();
if (size < 0) { if (size < 0)
size = 0; size = QtPrivate::qustrlen(unicode);
while (unicode[size] != 0)
++size;
}
QStringDecoder toUtf16(QStringDecoder::Utf16, QStringDecoder::Flag::Stateless); QStringDecoder toUtf16(QStringDecoder::Utf16, QStringDecoder::Flag::Stateless);
return toUtf16(QByteArrayView(reinterpret_cast<const char *>(unicode), size * 2)); return toUtf16(QByteArrayView(reinterpret_cast<const char *>(unicode), size * 2));
} }