From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 3 Mar 2018 19:02:19 +0000 (+0100)
Subject: patch 8.0.1561: crash with rust syntax highligting
X-Git-Tag: v8.0.1561
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=069dafc1ded60d9ee0fee4bcecce78ac8a235d87;p=vim

patch 8.0.1561: crash with rust syntax highligting

Problem:    Crash with rust syntax highligting. (Edd Barrett)
Solution:   Avoid going past the end of an empty line.
---

diff --git a/src/syntax.c b/src/syntax.c
index 81f460470..d0d4515e0 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -2470,7 +2470,8 @@ syn_current_attr(
 
     /* nextgroup ends at end of line, unless "skipnl" or "skipempty" present */
     if (current_next_list != NULL
-	    && syn_getcurline()[current_col + 1] == NUL
+	    && (line = syn_getcurline())[current_col] != NUL
+	    && line[current_col + 1] == NUL
 	    && !(current_next_flags & (HL_SKIPNL | HL_SKIPEMPTY)))
 	current_next_list = NULL;
 
diff --git a/src/version.c b/src/version.c
index f8777dcfd..ae51d723e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1561,
 /**/
     1560,
 /**/