Mercurial > vim
changeset 21417:53ff4dfe6e11 v8.2.1259
patch 8.2.1259: empty group in 'tabline' may cause using an invalid pointer
Commit: https://github.com/vim/vim/commit/f56c95fdad5af521887f8cd7bc15729b5355231d
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Jul 21 19:25:18 2020 +0200
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 https://github.com/vim/vim/issues/6505)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 21 Jul 2020 19:30:04 +0200 |
| parents | 0adf0004085a |
| children | ff4e8ce0b015 |
| files | src/buffer.c src/testdir/test_tabline.vim src/version.c |
| diffstat | 3 files changed, 33 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/buffer.c +++ b/src/buffer.c @@ -4229,12 +4229,19 @@ build_stl_str_hl( } if (n == curitem && group_start_userhl == group_end_userhl) { + // empty group p = t; l = 0; - // do not use the highlighting from the removed group for (n = groupitem[groupdepth] + 1; n < curitem; n++) + { + // do not use the highlighting from the removed group if (item[n].type == Highlight) 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)
--- a/src/testdir/test_tabline.vim +++ b/src/testdir/test_tabline.vim @@ -112,4 +112,27 @@ func Test_tabline_flags() %bw! 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