aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/buffer.c
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-07-21 18:51:47 -0400
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-08-02 12:00:00 -0400
commit9443d3994190943c2b9d8c4efefcf3de854ec7be (patch)
treeaba8e7e62c2d0307ff98eeb886c0a7e9abaf100d /src/nvim/buffer.c
parented41ac08cff396a52bf2bd2eef83205c55b079ba (diff)
downloadrneovim-9443d3994190943c2b9d8c4efefcf3de854ec7be.tar.gz
rneovim-9443d3994190943c2b9d8c4efefcf3de854ec7be.tar.bz2
rneovim-9443d3994190943c2b9d8c4efefcf3de854ec7be.zip
vim-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 vim/vim#6505) https://github.com/vim/vim/commit/f56c95fdad5af521887f8cd7bc15729b5355231d
Diffstat (limited to 'src/nvim/buffer.c')
-rw-r--r--src/nvim/buffer.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index 86067aceac..b3bbdce9d9 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -3646,13 +3646,19 @@ int build_stl_str_hl(
}
}
if (n == curitem && group_start_userhl == group_end_userhl) {
+ // empty group
out_p = t;
group_len = 0;
- // do not use the highlighting from the removed group
for (n = groupitems[groupdepth] + 1; n < curitem; n++) {
+ // do not use the highlighting from the removed group
if (items[n].type == Highlight) {
items[n].type = Empty;
}
+ // adjust the start position of TabPage to the next
+ // item position
+ if (items[n].type == TabPage) {
+ items[n].start = out_p;
+ }
}
}
}