feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Editor: Fix infinite loop in BaseTextFind

Browse Source 
Searching in a blockselection for the regular expressions
start of line '^' or line end '$' results in an infinite loop.

Only occures when the blockselection didn't contain the searched
regular expression.

Task-number: QTCREATORBUG-8159
Change-Id: I36412387ecce381300b75d0cd0a452ce5bf1094e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
David Schulz
2012-11-06 11:34:31 +01:00
parent 72c2a73bcb
commit abddfe7b14
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/find/basetextfind.cpp
View File

@@ -338,7 +338,18 @@ QTextCursor BaseTextFind::findOne(const QRegExp &expr, const QTextCursor &from,
Q_ARG(QTextCursor, candidate));
if (inVerticalFindScope)
return candidate;
candidate = document()->find(expr, candidate, options);
QTextCursor newCandidate = document()->find(expr, candidate, options);
if (newCandidate == candidate) {
// When searching for regular expressions that match "zero length" strings (like ^ or \b)
// we need to move away from the match before searching for the next one.
candidate.movePosition(options & QTextDocument::FindBackward
? QTextCursor::PreviousCharacter
: QTextCursor::NextCharacter);
candidate = document()->find(expr, candidate, options);
} else {
candidate = newCandidate;
}
}
return candidate;
}