diff options
| author | Bram Moolenaar <bram@vim.org> | 2013-11-02 04:39:38 +0100 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2013-11-02 04:39:38 +0100 |
| commit | 9bb5ba9733c92e76db5396b91d1d22cc0d5a3f50 (patch) | |
| tree | b991d05255a0f4359cfaa0955df64c120ac83246 | |
| parent | dbb425bbe25067b33ece2a918f579bd73a46e61c (diff) | |
| download | vim-7-4-054.tar.gz | |
Problem: Reading past end of the 'stl' string.
Solution: Don't increment pointer when already at the NUL. (Christian
Brabandt)
| -rw-r--r-- | src/buffer.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/buffer.c b/src/buffer.c index 34273d83..7b02ddaf 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 1e4766a3..c2217252 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, |