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

QString::lastIndexOf: fix off-by-one for zero length matches

Browse Source 
Otherwise, it would report that lastIndexOf of an empty pattern
in an empty string doesn't exist. Next commit adds extensive autotests;
for now, disable a broken autotest (which already features a comment
about why it's broken).

Change-Id: I9a0e5c0142007f81f5cf93e356c8bd82f00066f7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit be83ff65c424cff1036e7da19d6175826d9f7ed9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Giuseppe D'Angelo 2020-12-07 23:42:33 +01:00 committed by Qt Cherry-pick Bot
parent 9d2788bc86
commit e9af2a9519
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4263,13 +4263,13 @@ qsizetype QString::lastIndexOf(const QRegularExpression &re, qsizetype from, QRe
return -1; return -1;
} }
qsizetype endpos = (from < 0) ? (size() + from + 1) : (from + 1); qsizetype endpos = (from < 0) ? (size() + from + 1) : (from);
QRegularExpressionMatchIterator iterator = re.globalMatch(*this); QRegularExpressionMatchIterator iterator = re.globalMatch(*this);
qsizetype lastIndex = -1; qsizetype lastIndex = -1;
while (iterator.hasNext()) { while (iterator.hasNext()) {
QRegularExpressionMatch match = iterator.next(); QRegularExpressionMatch match = iterator.next();
qsizetype start = match.capturedStart(); qsizetype start = match.capturedStart();
if (start < endpos) { if (start <= endpos) {
lastIndex = start; lastIndex = start;
if (rmatch) if (rmatch)
*rmatch = std::move(match); *rmatch = std::move(match);

2
tests/auto/corelib/text/qstring/tst_qstring.cpp
View File

@ -1645,7 +1645,7 @@ void tst_QString::lastIndexOf()
QCOMPARE(haystack.lastIndexOf(needle.toLatin1(), from, cs), expected); QCOMPARE(haystack.lastIndexOf(needle.toLatin1(), from, cs), expected);
QCOMPARE(haystack.lastIndexOf(needle.toLatin1().data(), from, cs), expected); QCOMPARE(haystack.lastIndexOf(needle.toLatin1().data(), from, cs), expected);
if (from >= -1 && from < haystack.size()) { if (from >= -1 && from < haystack.size() && needle.size() > 0) {
// unfortunately, QString and QRegularExpression don't have the same out of bound semantics // unfortunately, QString and QRegularExpression don't have the same out of bound semantics
// I think QString is wrong -- See file log for contact information. // I think QString is wrong -- See file log for contact information.
{ {