diff options
| author | Bram Moolenaar <Bram@vim.org> | 2011-02-01 21:55:01 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2011-02-01 21:55:01 +0100 |
| commit | 1d87f516f2133dfadba1055c3009672ca96b84bf (patch) | |
| tree | 1cc45895b625f8c2798e9c6a806c315ee3f4b7b7 | |
| parent | 6145285c905ae9a65cf83473ad490e1b077a8c6f (diff) | |
| download | vim-git-1d87f516f2133dfadba1055c3009672ca96b84bf.tar.gz | |
updated for version 7.3.112v7.3.112
Problem: Setting 'statusline' to "%!'asdf%' reads uninitialized memory.
Solution: Check for NUL after %.
| -rw-r--r-- | src/buffer.c | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/buffer.c b/src/buffer.c index a7290aebb..e91b7c847 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -3364,7 +3364,8 @@ free_titles() * or truncated if too long, fillchar is used for all whitespace. */ int -build_stl_str_hl(wp, out, outlen, fmt, use_sandbox, fillchar, maxwidth, hltab, tabtab) +build_stl_str_hl(wp, out, outlen, fmt, use_sandbox, fillchar, + maxwidth, hltab, tabtab) win_T *wp; char_u *out; /* buffer to write into != NameBuff */ size_t outlen; /* length of out[] */ @@ -3474,6 +3475,8 @@ build_stl_str_hl(wp, out, outlen, fmt, use_sandbox, fillchar, maxwidth, hltab, t * Handle one '%' item. */ s++; + if (*s == NUL) /* ignore trailing % */ + break; if (*s == '%') { if (p + 1 >= out + outlen) diff --git a/src/version.c b/src/version.c index cc3174f31..ff5db0aa0 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 112, +/**/ 111, /**/ 110, |