aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.1.1395: saving for undo may access invalid memory

Browse Source 
Problem:    Saving for undo may access invalid memory. (Dominique Pelle)
Solution:   Set ml_line_len also when returning a constant string.
This commit is contained in:
Bram Moolenaar 2019-05-25 22:11:45 +02:00
parent a5e44600eb
commit adfde115d5
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/memline.c
View File

@ -2573,13 +2573,17 @@ ml_get_buf(
} }
errorret: errorret:
STRCPY(IObuff, "???"); STRCPY(IObuff, "???");
buf->b_ml.ml_line_len = 4;
return IObuff; return IObuff;
} }
if (lnum <= 0) /* pretend line 0 is line 1 */ if (lnum <= 0) // pretend line 0 is line 1
lnum = 1; lnum = 1;
if (buf->b_ml.ml_mfp == NULL) /* there are no lines */ if (buf->b_ml.ml_mfp == NULL) // there are no lines
{
buf->b_ml.ml_line_len = 1;
return (char_u *)""; return (char_u *)"";
}
/* /*
* See if it is the same line as requested last time. * See if it is the same line as requested last time.

9
src/testdir/test_textprop.vim
View File

@ -766,6 +766,15 @@ func Test_textprop_empty_buffer()
new new
call prop_add(1, 1, {'type': 'comment'}) call prop_add(1, 1, {'type': 'comment'})
close close
call prop_type_delete('comment')
endfunc
" Adding a text property to an empty buffer and then editing another
func Test_textprop_empty_buffer_next()
call prop_type_add("xxx", {})
call prop_add(1, 1, {"type": "xxx"})
next X
call prop_type_delete('xxx')
endfunc endfunc
func Test_textprop_remove_from_buf() func Test_textprop_remove_from_buf()

2
src/version.c
View File

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