aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

updated for version 7.4.562

Browse Source 
Problem:    Segfault with wide screen and error in 'rulerformat'. (Ingo Karkat)
Solution:   Check there is enough space. (Christian Brabandt)
This commit is contained in:
Bram Moolenaar
2015-01-07 13:31:52 +01:00
parent abe382cd2a
commit 0027c218e9
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/buffer.c
View File

@@ -4409,6 +4409,8 @@ get_rel_pos(wp, buf, buflen)
long above; /* number of lines above window */ long above; /* number of lines above window */
long below; /* number of lines below window */ long below; /* number of lines below window */
if (buflen < 3) /* need at least 3 chars for writing */
return;
above = wp->w_topline - 1; above = wp->w_topline - 1;
#ifdef FEAT_DIFF #ifdef FEAT_DIFF
above += diff_check_fill(wp, wp->w_topline) - wp->w_topfill; above += diff_check_fill(wp, wp->w_topline) - wp->w_topfill;

3
src/screen.c
View File

@@ -10588,7 +10588,8 @@ win_redr_ruler(wp, always)
this_ru_col = (WITH_WIDTH(width) + 1) / 2; this_ru_col = (WITH_WIDTH(width) + 1) / 2;
if (this_ru_col + o < WITH_WIDTH(width)) if (this_ru_col + o < WITH_WIDTH(width))
{ {
while (this_ru_col + o < WITH_WIDTH(width)) /* need at least 3 chars left for get_rel_pos() + NUL */
while (this_ru_col + o < WITH_WIDTH(width) && RULER_BUF_LEN > i + 4)
{ {
#ifdef FEAT_MBYTE #ifdef FEAT_MBYTE
if (has_mbyte) if (has_mbyte)

2
src/version.c
View File

@@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
562,
/**/ /**/
561, 561,
/**/ /**/