From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 19 Aug 2017 19:35:35 +0000 (+0200)
Subject: patch 8.0.0970: passing invalid highlight id
X-Git-Tag: v8.0.0970
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d6a7b3e6bbb8f87507de68d86cf70eab806aab3a;p=vim

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.
---

diff --git a/src/syntax.c b/src/syntax.c
index 637a45012..730357520 100644
--- 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. */
diff --git a/src/version.c b/src/version.c
index c1260ec87..d820595b5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    970,
 /**/
     969,
 /**/