diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-11-30 13:09:39 +0100 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-11-30 12:43:54 +0000 |
| commit | 448cdb7bb5ec58f55ea5065de5325e1be9eaf238 (patch) | |
| tree | 8654674697c2ea86255a90ca36935352e22aed88 /src/plugins/cpptools/cppfileiterationorder.cpp | |
| parent | 1a8fdb13791f93fe404589cc3f1e4f792f92fa96 (diff) | |
| download | qt-creator-448cdb7bb5ec58f55ea5065de5325e1be9eaf238.tar.gz | |
Fix a crash when editing cpp file
std::mismach() overload taking 3 arg assumes, that
second string is at least as long as the first one.
We don't guarantee this, as somethimes filePath2 is
empty string. Use 4 arg overload instead, which
ensure we don't exceed the valid range.
Fixes: QTCREATORBUG-24970
Change-Id: I8b7b11d124f69c7c9cb3246ee969f134fa026e08
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/cpptools/cppfileiterationorder.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppfileiterationorder.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/cpptools/cppfileiterationorder.cpp b/src/plugins/cpptools/cppfileiterationorder.cpp index dd040e9976..806a73b25d 100644 --- a/src/plugins/cpptools/cppfileiterationorder.cpp +++ b/src/plugins/cpptools/cppfileiterationorder.cpp @@ -108,9 +108,8 @@ bool FileIterationOrder::isValid() const static int commonPrefixLength(const QString &filePath1, const QString &filePath2) { - const auto mismatches = std::mismatch(filePath1.begin(), - filePath1.end(), - filePath2.begin()); + const auto mismatches = std::mismatch(filePath1.begin(), filePath1.end(), + filePath2.begin(), filePath2.end()); return mismatches.first - filePath1.begin(); } |