summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-01-10 20:54:17 +0100
committerBram Moolenaar <Bram@vim.org>2016-01-10 20:54:17 +0100
commit507edf63df75fe228e0f76b845b58d60266e65d8 (patch)
tree360a0b6bdd05365981e0fbf27feb55138a21cf10
parenta52dfaed104183c1fa2a3b6e4430b23d86bcbece (diff)
downloadvim-git-507edf63df75fe228e0f76b845b58d60266e65d8.tar.gz
patch 7.4.1086v7.4.1086
Problem: Crash with an extremely long buffer name. Solution: Limit the return value of vim_snprintf(). (Dominique Pelle)
-rw-r--r--src/buffer.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/buffer.c b/src/buffer.c
index d1907a44f..fd94a2744 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -2793,6 +2793,8 @@ buflist_list(eap)
(buf->b_flags & BF_READERR) ? 'x'
: (bufIsChanged(buf) ? '+' : ' '),
NameBuff);
+ if (len > IOSIZE - 20)
+ len = IOSIZE - 20;
/* put "line 999" in column 40 or after the file name */
i = 40 - vim_strsize(IObuff);
diff --git a/src/version.c b/src/version.c
index 07d2c2631..b753f174e 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 */
/**/
+ 1086,
+/**/
1085,
/**/
1084,