Fix Buffer::char_next when the line ends with an invalid utf8 sequence

2013-12-12 13:45:14 +00:00 · 2013-12-12 13:45:14 +00:00 · 563f62b467
commit 563f62b467
parent bd80cf0404
1 changed files with 6 additions and 0 deletions
--- a/src/buffer.cc
+++ b/src/buffer.cc
@ -673,6 +673,12 @@ BufferCoord Buffer::char_next(BufferCoord coord) const
    {
        auto& line = m_lines[coord.line].content;
        coord.column += utf8::codepoint_size(line.begin() + (int)coord.column);
+        // Handle invalid utf-8
+        if (coord.column >= line.length())
+        {
+            ++coord.line;
+            coord.column = 0;
+        }
    }
    else if (coord.line == m_lines.size() - 1)
        coord.column = m_lines.back().length();