xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid infinite loop in MultiRegionHighlighter when regexes generate empty matches

Browse Source
This commit is contained in:
Maxime Coste 2014-07-14 20:46:46 +01:00
parent 12cdfb316a
commit d5d76721b0
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/highlighters.cc
View File

@ -1137,7 +1137,18 @@ private:
cache.regions.push_back({ beg_it->begin_coord(),
end_it->end_coord(),
named_region.first });
begin = find_next_begin(cache, end_it->end_coord());
auto end_coord = end_it->end_coord();
// With empty begin and end matches (for example if the regexes
// are /"\K/ and /(?=")/), that case can happen, and would
// result in an infinite loop.
if (end_coord == beg_it->begin_coord())
{
kak_assert(beg_it->begin_coord() == beg_it->end_coord() and
end_it->begin_coord() == end_it->end_coord());
++end_coord.column;
}
begin = find_next_begin(cache, end_coord);
}
}
cache.timestamp = buf_timestamp;