mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-26 12:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.0.0970: passing invalid highlight id #10972

Browse Source 
(We don't implement StatusLineTerm{NC}, but this patch seems generally relevant.)

Problem:    if there is no StatusLine highlighting and there is StatusLineNC
            or StatusLineTermNC highlighting then an invalid highlight id is
            passed to combine_stl_hlt(). (Coverity)
Solution:   Check id_S to be -1 instead of zero.
d6a7b3e6bb
This commit is contained in:
Justin M. Keyes
2019-09-08 15:10:18 -07:00
committed by GitHub
parent d91f4cd7d0
commit ccd947ca4a
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/nvim/syntax.c
View File

@@ -7559,14 +7559,15 @@ void highlight_changed(void)
} }
} }
/* Setup the user highlights //
* // Setup the user highlights
* Temporarily utilize 10 more hl entries. Have to be in there //
* simultaneously in case of table overflows in get_attr_entry() // Temporarily utilize 10 more hl entries. Must be in there
*/ // simultaneously in case of table overflows in get_attr_entry()
//
ga_grow(&highlight_ga, 10); ga_grow(&highlight_ga, 10);
hlcnt = highlight_ga.ga_len; hlcnt = highlight_ga.ga_len;
if (id_S == 0) { /* Make sure id_S is always valid to simplify code below */ if (id_S == -1) { // Make sure id_S is always valid to simplify code below.
memset(&HL_TABLE()[hlcnt + 9], 0, sizeof(struct hl_group)); memset(&HL_TABLE()[hlcnt + 9], 0, sizeof(struct hl_group));
id_S = hlcnt + 10; id_S = hlcnt + 10;
} }
@@ -7590,7 +7591,7 @@ void highlight_changed(void)
sizeof(struct hl_group)); sizeof(struct hl_group));
hlt[hlcnt + i].sg_link = 0; hlt[hlcnt + i].sg_link = 0;
/* Apply difference between UserX and HLF_S to HLF_SNC */ // Apply difference between UserX and HLF_S to HLF_SNC.
hlt[hlcnt + i].sg_cterm ^= hlt[id - 1].sg_cterm ^ hlt[id_S - 1].sg_cterm; hlt[hlcnt + i].sg_cterm ^= hlt[id - 1].sg_cterm ^ hlt[id_S - 1].sg_cterm;
if (hlt[id - 1].sg_cterm_fg != hlt[id_S - 1].sg_cterm_fg) { if (hlt[id - 1].sg_cterm_fg != hlt[id_S - 1].sg_cterm_fg) {