mawww/kakoune
1
1
Fork 0
mirror of https://github.com/mawww/kakoune.git synced 2024-12-23 19:46:33 +03:00
Code Issues Projects Releases Wiki Activity

Fix infinite loop when comparing RankedMatches containing invalid utf8

Browse Source 
If we had a word containing some invalid utf8, like a wrong sequence
of continuation bytes, we would infinitely loop back to the previous
valid character start.

Fixes #1157
This commit is contained in:
Maxime Coste 2017-01-29 23:50:33 +00:00
parent 1ff60ff592
commit 632e05d830
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ranked_match.cc
View File

@ -186,6 +186,7 @@ bool RankedMatch::operator<(const RankedMatch& other) const
auto it1 = m_candidate.begin(), it2 = other.m_candidate.begin(); auto it1 = m_candidate.begin(), it2 = other.m_candidate.begin();
const auto end1 = m_candidate.end(), end2 = other.m_candidate.end(); const auto end1 = m_candidate.end(), end2 = other.m_candidate.end();
auto last1 = it1, last2 = it2;
while (true) while (true)
{ {
// find next mismatch // find next mismatch
@ -196,8 +197,8 @@ bool RankedMatch::operator<(const RankedMatch& other) const
return it1 == end1 and it2 != end2; return it1 == end1 and it2 != end2;
// compare codepoints // compare codepoints
it1 = utf8::character_start(it1, m_candidate.begin()); it1 = utf8::character_start(it1, last1);
it2 = utf8::character_start(it2, other.m_candidate.begin()); it2 = utf8::character_start(it2, last2);
const auto cp1 = utf8::read_codepoint(it1, end1); const auto cp1 = utf8::read_codepoint(it1, end1);
const auto cp2 = utf8::read_codepoint(it2, end2); const auto cp2 = utf8::read_codepoint(it2, end2);
if (cp1 != cp2) if (cp1 != cp2)
@ -206,6 +207,7 @@ bool RankedMatch::operator<(const RankedMatch& other) const
const bool low2 = iswlower((wchar_t)cp2); const bool low2 = iswlower((wchar_t)cp2);
return low1 == low2 ? cp1 < cp2 : low1; return low1 == low2 ? cp1 < cp2 : low1;
} }
last1 = it1; last2 = it2;
} }
} }