patch 8.0.1486: accessing invalid memory with "it"
Problem: Accessing invalid memory with "it". (Dominique Pelle)
Solution: Avoid going over the end of the line. (Christian Brabandt,
closes #2532)
diff --git a/src/search.c b/src/search.c
index efcf3d9..8089dcf 100644
--- a/src/search.c
+++ b/src/search.c
@@ -684,11 +684,11 @@
&& pos->lnum >= 1 && pos->lnum <= buf->b_ml.ml_line_count
&& pos->col < MAXCOL - 2)
{
- ptr = ml_get_buf(buf, pos->lnum, FALSE) + pos->col;
- if (*ptr == NUL)
+ ptr = ml_get_buf(buf, pos->lnum, FALSE);
+ if ((int)STRLEN(ptr) < pos->col)
start_char_len = 1;
else
- start_char_len = (*mb_ptr2len)(ptr);
+ start_char_len = (*mb_ptr2len)(ptr + pos->col);
}
#endif
else