neovim

commit 108452aabad80af08351d137f528985ac339b295
parent 0f52e2c849cbd923fc30b8bbef088b6f7642aeab
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Sun, 22 Jan 2023 07:41:39 +0800

vim-patch:9.0.1225: reading past the end of a line when formatting text (#21937)

Problem:    Reading past the end of a line when formatting text.
Solution:   Check for not going over the end of the line.

https://github.com/vim/vim/commit/11977f917506d950b7e0cae558bd9189260b253b

Co-authored-by: Bram Moolenaar <Bram@vim.org>
Diffstat:
M
src/nvim/textformat.c
 | 
9
++++++++-

1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/nvim/textformat.c b/src/nvim/textformat.c
@@ -530,6 +530,9 @@ static bool same_leader(linenr_T lnum, int leader1_len, char *leader1_flags, int
     return leader2_len == 0;
   }
 
+  char *lnum_line = NULL;
+  int line_len = 0;
+
   // If first leader has 'f' flag, the lines can be joined only if the
   // second line does not have a leader.
   // If first leader has 'e' flag, the lines can never be joined.
@@ -544,7 +547,11 @@ static bool same_leader(linenr_T lnum, int leader1_len, char *leader1_flags, int
         return false;
       }
       if (*p == COM_START) {
-        if (*(ml_get(lnum) + leader1_len) == NUL) {
+        if (lnum_line == NULL) {
+          lnum_line = ml_get(lnum);
+          line_len = (int)strlen(lnum_line);
+        }
+        if (line_len <= leader1_len) {
           return false;
         }
         if (leader2_flags == NULL || leader2_len == 0) {