summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-06-19 21:06:11 +0200
committerBram Moolenaar <Bram@vim.org>2015-06-19 21:06:11 +0200
commit6a7e2a668b492b5b574e489790e349a9058e2a48 (patch)
treeaaed7fbe6bb48d5913c4f997fb53b0a330bfb140
parente2db6c975b97685ca58bd767a2b98cd8a94c1938 (diff)
downloadvim-git-6a7e2a668b492b5b574e489790e349a9058e2a48.tar.gz
patch 7.4.748v7.4.748
Problem: Buffer overflow. Solution: Make the buffer larger. (Kazunobu Kuriyama)
-rw-r--r--src/eval.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c
index 665536c73..452014f75 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -17157,7 +17157,7 @@ f_setmatches(argvars, rettv)
while (li != NULL)
{
int i = 0;
- char_u buf[4];
+ char_u buf[5];
dictitem_T *di;
d = li->li_tv.vval.v_dict;
diff --git a/src/version.c b/src/version.c
index 4505a3e89..dfc2ed3c5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 748,
+/**/
747,
/**/
746,