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

Fix QString::toHtmlEscaped() for >2Gi character strings

Browse Source 
More unfinished int → qsizetype porting.

Fixes: QTBUG-105104
Change-Id: I3470de31c476b3d7736661550916828e43546573
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit c1991c63fc081a42ed3e6a28f82f395c54ef42a1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2022-07-20 19:21:06 +02:00 committed by Qt Cherry-pick Bot
parent 1fa58a3d8b
commit a974968d61
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10896,19 +10896,19 @@ qsizetype QtPrivate::count(QStringView haystack, const QRegularExpression &re)
QString QString::toHtmlEscaped() const
{
QString rich;
const int len = length();
const qsizetype len = length();
rich.reserve(qsizetype(len * 1.1));
for (int i = 0; i < len; ++i) {
if (at(i) == u'<')
for (QChar ch : *this) {
if (ch == u'<')
rich += "&lt;"_L1;
else if (at(i) == u'>')
else if (ch == u'>')
rich += "&gt;"_L1;
else if (at(i) == u'&')
else if (ch == u'&')
rich += "&amp;"_L1;
else if (at(i) == u'"')
else if (ch == u'"')
rich += "&quot;"_L1;
else
rich += at(i);
rich += ch;
}
rich.squeeze();
return rich;