kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-20 03:05:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

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

11977f9175

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
zeertzjq 2023-01-22 07:41:39 +08:00 committed by GitHub
parent 0f52e2c849
commit 108452aaba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/nvim/textformat.c
View File

@ -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) {