summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-11-02 04:39:38 +0100
committerBram Moolenaar <Bram@vim.org>2013-11-02 04:39:38 +0100
commit1180822670e987ef204dfbf24e55fc09eed89650 (patch)
tree1b127d0583fb4a04d9be8358f3fd222cf48febb3 /src
parentb69a714bb75e25881eb3d4ce116894272535202b (diff)
downloadvim-git-1180822670e987ef204dfbf24e55fc09eed89650.tar.gz
updated for version 7.4.054v7.4.054
Problem: Reading past end of the 'stl' string. Solution: Don't increment pointer when already at the NUL. (Christian Brabandt)
Diffstat (limited to 'src')
-rw-r--r--src/buffer.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
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
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 54,
+/**/
53,
/**/
52,