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

QStringConverter: fix int/qsizetype mismatches (ex Win32)

Browse Source 
I can't test on Windows, so skipped the platform-specific code.

Change-Id: Id13d4abc447ddd5d17fb67b670b83207877456f6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 4440387b85bbed53f4b118b8098cc616b4e6c92a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2022-01-21 00:53:16 +01:00 committed by Qt Cherry-pick Bot
parent 297323652b
commit aacd03be67
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/corelib/text/qstringconverter.cpp
View File

@ -996,7 +996,7 @@ QChar *QUtf16::convertToUnicode(QChar *out, QByteArrayView in, QStringConverter:
endian = (QSysInfo::ByteOrder == QSysInfo::BigEndian) ? BigEndianness : LittleEndianness; endian = (QSysInfo::ByteOrder == QSysInfo::BigEndian) ? BigEndianness : LittleEndianness;
} }
int nPairs = (end - chars) >> 1; qsizetype nPairs = (end - chars) >> 1;
if (endian == BigEndianness) if (endian == BigEndianness)
qFromBigEndian<ushort>(chars, nPairs, out); qFromBigEndian<ushort>(chars, nPairs, out);
else else
@ -1022,7 +1022,7 @@ QChar *QUtf16::convertToUnicode(QChar *out, QByteArrayView in, QStringConverter:
QByteArray QUtf32::convertFromUnicode(QStringView in, QStringConverter::State *state, DataEndianness endian) QByteArray QUtf32::convertFromUnicode(QStringView in, QStringConverter::State *state, DataEndianness endian)
{ {
bool writeBom = !(state->internalState & HeaderDone) && state->flags & QStringConverter::Flag::WriteBom; bool writeBom = !(state->internalState & HeaderDone) && state->flags & QStringConverter::Flag::WriteBom;
int length = 4*in.size(); qsizetype length = 4*in.size();
if (writeBom) if (writeBom)
length += 4; length += 4;
QByteArray ba(length, Qt::Uninitialized); QByteArray ba(length, Qt::Uninitialized);
@ -1142,7 +1142,7 @@ QChar *QUtf32::convertToUnicode(QChar *out, QByteArrayView in, QStringConverter:
if (state->flags & QStringConverter::Flag::ConvertInitialBom) if (state->flags & QStringConverter::Flag::ConvertInitialBom)
headerdone = true; headerdone = true;
int num = state->remainingChars; qsizetype num = state->remainingChars;
state->remainingChars = 0; state->remainingChars = 0;
if (!headerdone || endian == DetectEndianness || num) { if (!headerdone || endian == DetectEndianness || num) {
@ -1212,8 +1212,8 @@ static QString convertToUnicodeCharByChar(QByteArrayView in, QStringConverter::S
if (!chars || !length) if (!chars || !length)
return QString(); return QString();
int copyLocation = 0; qsizetype copyLocation = 0;
int extra = 2; qsizetype extra = 2;
if (state && state->remainingChars) { if (state && state->remainingChars) {
copyLocation = state->remainingChars; copyLocation = state->remainingChars;
extra += copyLocation; extra += copyLocation;
@ -1474,7 +1474,7 @@ static char *toLatin1(char *out, QStringView in, QStringConverter::State *state)
state = nullptr; state = nullptr;
const char replacement = (state && state->flags & QStringConverter::Flag::ConvertInvalidToNull) ? 0 : '?'; const char replacement = (state && state->flags & QStringConverter::Flag::ConvertInvalidToNull) ? 0 : '?';
int invalid = 0; qsizetype invalid = 0;
for (qsizetype i = 0; i < in.length(); ++i) { for (qsizetype i = 0; i < in.length(); ++i) {
if (in[i] > QChar(0xff)) { if (in[i] > QChar(0xff)) {
*out = replacement; *out = replacement;
@ -1810,7 +1810,7 @@ std::optional<QStringConverter::Encoding> QStringConverter::encodingForHtml(QByt
return encoding; return encoding;
QByteArray header = data.first(qMin(data.size(), qsizetype(1024))).toByteArray().toLower(); QByteArray header = data.first(qMin(data.size(), qsizetype(1024))).toByteArray().toLower();
int pos = header.indexOf("meta "); qsizetype pos = header.indexOf("meta ");
if (pos != -1) { if (pos != -1) {
pos = header.indexOf("charset=", pos); pos = header.indexOf("charset=", pos);
if (pos != -1) { if (pos != -1) {
@ -1818,14 +1818,14 @@ std::optional<QStringConverter::Encoding> QStringConverter::encodingForHtml(QByt
if (pos < header.size() && (header.at(pos) == '\"' || header.at(pos) == '\'')) if (pos < header.size() && (header.at(pos) == '\"' || header.at(pos) == '\''))
++pos; ++pos;
int pos2 = pos; qsizetype pos2 = pos;
// The attribute can be closed with either """, "'", ">" or "/", // The attribute can be closed with either """, "'", ">" or "/",
// none of which are valid charset characters. // none of which are valid charset characters.
while (++pos2 < header.size()) { while (++pos2 < header.size()) {
char ch = header.at(pos2); char ch = header.at(pos2);
if (ch == '\"' || ch == '\'' || ch == '>' || ch == '/') { if (ch == '\"' || ch == '\'' || ch == '>' || ch == '/') {
QByteArray name = header.mid(pos, pos2 - pos); QByteArray name = header.mid(pos, pos2 - pos);
int colon = name.indexOf(':'); qsizetype colon = name.indexOf(':');
if (colon > 0) if (colon > 0)
name = name.left(colon); name = name.left(colon);
name = name.simplified(); name = name.simplified();