# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1503171904 -7200
# Node ID 88ca0110abd533d140afdb98bfe1f0f535f466db
# Parent  a6578fa88dc30dc82cb15f856b399afb3f53d37e
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.

diff --git a/src/syntax.c b/src/syntax.c
--- 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
--- 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,