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

Fix crash on case-preserving replace

Browse Source 
Task-number: QTCREATORBUG-8821

Change-Id: Icb843108bd48dd1266469667f318a5ef32b05e06
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
This commit is contained in:
Nuno Sucena Almeida
2013-02-24 18:59:26 -05:00
committed by David Schulz
parent eb97b2b1cb
commit 05b6c466c3
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libs/utils/filesearch.cpp
View File

@@ -352,6 +352,9 @@ namespace Utils {
namespace Internal { namespace Internal {
QString matchCaseReplacement(const QString &originalText, const QString &replaceText) QString matchCaseReplacement(const QString &originalText, const QString &replaceText)
{ {
if (originalText.isEmpty())
return replaceText;
//Now proceed with actual case matching //Now proceed with actual case matching
bool firstIsUpperCase = originalText.at(0).isUpper(); bool firstIsUpperCase = originalText.at(0).isUpper();
bool firstIsLowerCase = originalText.at(0).isLower(); bool firstIsLowerCase = originalText.at(0).isLower();
@@ -397,12 +400,12 @@ QString Utils::matchCaseReplacement(const QString &originalText, const QString &
const int originalTextLen = originalText.length(); const int originalTextLen = originalText.length();
int prefixLen = 0; int prefixLen = 0;
for (; prefixLen <= replaceTextLen && prefixLen <= originalTextLen; prefixLen++) for (; prefixLen < replaceTextLen && prefixLen < originalTextLen; ++prefixLen)
if (replaceText.at(prefixLen).toLower() != originalText.at(prefixLen).toLower()) if (replaceText.at(prefixLen).toLower() != originalText.at(prefixLen).toLower())
break; break;
int suffixLen = 0; int suffixLen = 0;
for (; suffixLen < replaceTextLen - prefixLen && suffixLen < originalTextLen - prefixLen; suffixLen++) for (; suffixLen < replaceTextLen - prefixLen && suffixLen < originalTextLen - prefixLen; ++suffixLen)
if (replaceText.at(replaceTextLen - 1 - suffixLen).toLower() != originalText.at(originalTextLen- 1 - suffixLen).toLower()) if (replaceText.at(replaceTextLen - 1 - suffixLen).toLower() != originalText.at(originalTextLen- 1 - suffixLen).toLower())
break; break;