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

QUnicodeTools: fix truncation in debug statements

Browse Source 
Instead of casting to int, cast to qlonglong, which is guaranteed to
be able to hold all qsizetype values.

Task-number: QTBUG-103531
Change-Id: I3e89892defd091fa6ef305b8ed5c3819a2cc13da
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 8dbc569538da7011d3c2c7099abe8069ed3db68f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2022-08-11 14:05:53 +02:00 committed by Qt Cherry-pick Bot
parent c159699982
commit e10a4a6c01
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/corelib/text/qunicodetools.cpp
View File

@ -1297,12 +1297,12 @@ static inline Form form(unsigned short uc) {
static qsizetype indic_nextSyllableBoundary(QChar::Script script, const char16_t *s, qsizetype start, qsizetype end, bool *invalid) static qsizetype indic_nextSyllableBoundary(QChar::Script script, const char16_t *s, qsizetype start, qsizetype end, bool *invalid)
{ {
*invalid = false; *invalid = false;
IDEBUG("indic_nextSyllableBoundary: start=%d, end=%d", int(start), int(end)); IDEBUG("indic_nextSyllableBoundary: start=%lld, end=%lld", qlonglong(start), qlonglong(end));
const char16_t *uc = s+start; const char16_t *uc = s+start;
qsizetype pos = 0; qsizetype pos = 0;
Form state = form(uc[pos]); Form state = form(uc[pos]);
IDEBUG("state[%d]=%d (uc=%4x)", int(pos), state, uc[pos]); IDEBUG("state[%lld]=%d (uc=%4x)", qlonglong(pos), state, uc[pos]);
pos++; pos++;
if (state != Consonant && state != IndependentVowel) { if (state != Consonant && state != IndependentVowel) {
@ -1313,7 +1313,7 @@ static qsizetype indic_nextSyllableBoundary(QChar::Script script, const char16_t
while (pos < end - start) { while (pos < end - start) {
Form newState = form(uc[pos]); Form newState = form(uc[pos]);
IDEBUG("state[%d]=%d (uc=%4x)", int(pos), newState, uc[pos]); IDEBUG("state[%lld]=%d (uc=%4x)", qlonglong(pos), newState, uc[pos]);
switch (newState) { switch (newState) {
case Control: case Control:
newState = state; newState = state;
@ -1860,7 +1860,7 @@ static qsizetype myanmar_nextSyllableBoundary(const char16_t *s, qsizetype start
if (pos == start) if (pos == start)
*invalid = (bool)(charClass & Mymr_CF_DOTTED_CIRCLE); *invalid = (bool)(charClass & Mymr_CF_DOTTED_CIRCLE);
MMDEBUG("state[%d]=%d class=%8x (uc=%4x)", int(pos - start), state, charClass, *uc); MMDEBUG("state[%lld]=%d class=%8x (uc=%4x)", qlonglong(pos - start), state, charClass, *uc);
if (state < 0) { if (state < 0) {
if (state < -1) if (state < -1)
@ -2195,7 +2195,7 @@ static qsizetype khmer_nextSyllableBoundary(const char16_t *s, qsizetype start,
} }
state = khmerStateTable[state][charClass & CF_CLASS_MASK]; state = khmerStateTable[state][charClass & CF_CLASS_MASK];
KHDEBUG("state[%d]=%d class=%8lx (uc=%4x)", int(pos - start), state, KHDEBUG("state[%lld]=%d class=%8lx (uc=%4x)", qlonglong(pos - start), state,
charClass, *uc ); charClass, *uc );
if (state < 0) { if (state < 0) {