IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch: 7.4.1086 #4626

Browse Source 
Problem:    Crash with an extremely long buffer name.
Solution:   Limit the return value of vim_snprintf(). (Dominique Pelle)

507edf63df
This commit is contained in:
Michael Ennen 2016-04-21 12:25:44 -07:00 committed by Justin M. Keyes
parent c72b60645c
commit 86eb339120
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/nvim/buffer.c
View File

@ -2195,15 +2195,16 @@ void buflist_list(exarg_T *eap)
len = vim_snprintf((char *)IObuff, IOSIZE - 20, "%3d%c%c%c%c%c \"%s\"", len = vim_snprintf((char *)IObuff, IOSIZE - 20, "%3d%c%c%c%c%c \"%s\"",
buf->b_fnum, buf->b_fnum,
buf->b_p_bl ? ' ' : 'u', buf->b_p_bl ? ' ' : 'u',
buf == curbuf ? '%' : buf == curbuf ? '%' : (curwin->w_alt_fnum == buf->b_fnum ? '#' : ' '),
(curwin->w_alt_fnum == buf->b_fnum ? '#' : ' '), buf->b_ml.ml_mfp == NULL ? ' ' : (buf->b_nwindows == 0 ? 'h' : 'a'),
buf->b_ml.ml_mfp == NULL ? ' ' :
(buf->b_nwindows == 0 ? 'h' : 'a'),
!MODIFIABLE(buf) ? '-' : (buf->b_p_ro ? '=' : ' '), !MODIFIABLE(buf) ? '-' : (buf->b_p_ro ? '=' : ' '),
(buf->b_flags & BF_READERR) ? 'x' (buf->b_flags & BF_READERR) ? 'x' : (bufIsChanged(buf) ? '+' : ' '),
: (bufIsChanged(buf) ? '+' : ' '),
NameBuff); NameBuff);
if (len > IOSIZE - 20) {
len = IOSIZE - 20;
}
/* put "line 999" in column 40 or after the file name */ /* put "line 999" in column 40 or after the file name */
i = 40 - vim_strsize(IObuff); i = 40 - vim_strsize(IObuff);
do { do {

2
src/nvim/version.c
View File

@ -592,7 +592,7 @@ static int included_patches[] = {
1089, 1089,
1088, 1088,
1087, 1087,
// 1086, 1086,
1085, 1085,
1084, 1084,
// 1083 NA // 1083 NA