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 637a45012c41492b5835a014126ff46524425666..730357520221e351729808d8786da91915a224ae 100644 (file)
--- 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 c1260ec870a58b573cc294380e90405376eee905..d820595b5064c46f8e442cab8c35bd66e8ac2831 100644 (file)
--- 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,
 /**/