Mercurial > vim

changeset 12180:88ca0110abd5 v8.0.0970

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.0970: passing invalid highlight id commit https://github.com/vim/vim/commit/d6a7b3e6bbb8f87507de68d86cf70eab806aab3a Author: Bram Moolenaar <Bram@vim.org> Date: Sat Aug 19 21:35:35 2017 +0200 patch 8.0.0970: passing invalid highlight id 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.
author Christian Brabandt <cb@256bit.org>
date Sat, 19 Aug 2017 21:45:04 +0200
parents a6578fa88dc3
children 0405537ac0a2
files src/syntax.c src/version.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -9999,7 +9999,7 @@ highlight_changed(void)
     if (ga_grow(&highlight_ga, 28) == FAIL)
 	return FAIL;
     hlcnt = highlight_ga.ga_len;
-    if (id_S == 0)
+    if (id_S == -1)
     {
 	/* Make sure id_S is always valid to simplify code below. Use the last
 	 * entry. */
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    970,
+/**/
     969,
 /**/
     968,