# HG changeset patch
# User Bram Moolenaar <bram@vim.org>
# Date 1383363578 -3600
# Node ID 7b760cda2bbf086ba975fd5a4bdc6190a0f08caf
# Parent  95b054866009b68a10882155b4646c0ac9eb0183
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
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -4062,7 +4062,8 @@ build_stl_str_hl(wp, out, outlen, fmt, u
 		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
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    54,
+/**/
     53,
 /**/
     52,