updated for version 7.4.054 v7.4.054
authorBram Moolenaar <Bram@vim.org>
Sat, 2 Nov 2013 03:39:38 +0000 (04:39 +0100)
committerBram Moolenaar <Bram@vim.org>
Sat, 2 Nov 2013 03:39:38 +0000 (04:39 +0100)
Problem:    Reading past end of the 'stl' string.
Solution:   Don't increment pointer when already at the NUL. (Christian
            Brabandt)

src/buffer.c
src/version.c

index 34273d83b5dfe5341e26d1da3030d264b88eaaeb..7b02ddaf5741c7dace1590e425de1650ff84f56b 100644 (file)
@@ -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;
        }
 
index 1e4766a395dd0e74129a2d13283a32c6ebec4488..c22172525db1c08d326983f525bee05d7a79d436 100644 (file)
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    54,
 /**/
     53,
 /**/