1 files changed, 4 insertions, 0 deletions
diff --git a/src/nvim/misc1.c b/src/nvim/misc1.c
index ad0a8d409f..99dc29f119 100644
--- a/src/nvim/misc1.c
+++ b/src/nvim/misc1.c
@@ -1752,6 +1752,10 @@ del_lines (
 
 int gchar_pos(pos_T *pos)
 {
+  // When searching columns is sometimes put at the end of a line.
+  if (pos->col == MAXCOL) {
+    return NUL;
+  }
   return utf_ptr2char(ml_get_pos(pos));
 }