From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 2 Nov 2013 03:39:38 +0000 (+0100)
Subject: updated for version 7.4.054
X-Git-Tag: v7.4.054
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1180822670e987ef204dfbf24e55fc09eed89650;p=vim

updated for version 7.4.054
Problem:    Reading past end of the 'stl' string.
Solution:   Don't increment pointer when already at the NUL. (Christian
            Brabandt)
---

diff --git a/src/buffer.c b/src/buffer.c
index 34273d83b..7b02ddaf5 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -4062,7 +4062,8 @@ build_stl_str_hl(wp, out, outlen, fmt, use_sandbox, fillchar,
 		item[curitem].minwid = -syn_namen2id(t, (int)(s - t));
 		curitem++;
 	    }
-	    ++s;
+	    if (*s != NUL)
+		++s;
 	    continue;
 	}
 
diff --git a/src/version.c b/src/version.c
index 1e4766a39..c22172525 100644
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    54,
 /**/
     53,
 /**/