aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-02 05:04:20 -04:00
Code Activity

patch 9.0.1225: reading past the end of a line when formatting text

Browse Source 
Problem:    Reading past the end of a line when formatting text.
Solution:   Check for not going over the end of the line.
This commit is contained in:
Bram Moolenaar
2023-01-21 13:09:19 +00:00
parent 47bba53bdb
commit 11977f9175
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/textformat.c
View File

@@ -540,6 +540,9 @@ same_leader(
if (leader1_len == 0)
return (leader2_len == 0);
char_u *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.
@@ -555,7 +558,12 @@ same_leader(
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)
return FALSE;

2
src/version.c
View File

@@ -695,6 +695,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1225,
/**/
1224,
/**/