mirror of
https://github.com/vim/vim.git
synced 2025-09-24 03:44:06 -04:00
patch 8.2.1259: empty group in 'tabline' may cause using an invalid pointer
Problem: Empty group in 'tabline' may cause using an invalid pointer. Solution: Set the group start position. (closes #6505)
This commit is contained in:
@@ -4229,12 +4229,19 @@ build_stl_str_hl(
|
|||||||
}
|
}
|
||||||
if (n == curitem && group_start_userhl == group_end_userhl)
|
if (n == curitem && group_start_userhl == group_end_userhl)
|
||||||
{
|
{
|
||||||
|
// empty group
|
||||||
p = t;
|
p = t;
|
||||||
l = 0;
|
l = 0;
|
||||||
// do not use the highlighting from the removed group
|
|
||||||
for (n = groupitem[groupdepth] + 1; n < curitem; n++)
|
for (n = groupitem[groupdepth] + 1; n < curitem; n++)
|
||||||
|
{
|
||||||
|
// do not use the highlighting from the removed group
|
||||||
if (item[n].type == Highlight)
|
if (item[n].type == Highlight)
|
||||||
item[n].type = Empty;
|
item[n].type = Empty;
|
||||||
|
// adjust the start position of TabPage to the next
|
||||||
|
// item position
|
||||||
|
if (item[n].type == TabPage)
|
||||||
|
item[n].start = p;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (l > item[groupitem[groupdepth]].maxwid)
|
if (l > item[groupitem[groupdepth]].maxwid)
|
||||||
|
@@ -112,4 +112,27 @@ func Test_tabline_flags()
|
|||||||
%bw!
|
%bw!
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
function EmptyTabname()
|
||||||
|
return ""
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
function MakeTabLine() abort
|
||||||
|
let titles = map(range(1, tabpagenr('$')), '"%( %" . v:val . "T%{EmptyTabname()}%T %)"')
|
||||||
|
let sep = 'あ'
|
||||||
|
let tabpages = join(titles, sep)
|
||||||
|
return tabpages .. sep .. '%=%999X X'
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
func Test_tabline_empty_group()
|
||||||
|
" this was reading invalid memory
|
||||||
|
set tabline=%!MakeTabLine()
|
||||||
|
tabnew
|
||||||
|
redraw!
|
||||||
|
|
||||||
|
tabclose
|
||||||
|
set tabline=
|
||||||
|
endfunc
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
" vim: shiftwidth=2 sts=2 expandtab
|
" vim: shiftwidth=2 sts=2 expandtab
|
||||||
|
@@ -754,6 +754,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 */
|
||||||
|
/**/
|
||||||
|
1259,
|
||||||
/**/
|
/**/
|
||||||
1258,
|
1258,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user