updated for version 7.4.562

Problem:    Segfault with wide screen and error in 'rulerformat'. (Ingo Karkat)
Solution:   Check there is enough space. (Christian Brabandt)

diff --git a/src/buffer.c b/src/buffer.c
index 37182e146c0a7c00d44de8d08735ea2d16bc083d..0d14706063d72b8826f1fe3e79dcdb7a092cc23a 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -4409,6 +4409,8 @@ get_rel_pos(wp, buf, buflen)
     long       above; /* number of lines above window */
     long       below; /* number of lines below window */
 
+    if (buflen < 3) /* need at least 3 chars for writing */
+       return;
     above = wp->w_topline - 1;
 #ifdef FEAT_DIFF
     above += diff_check_fill(wp, wp->w_topline) - wp->w_topfill;

diff --git a/src/screen.c b/src/screen.c
index e7b8e78d78006ae4ffedfa068b9281ec15f31cbb..290dd1bd3d16aebd6eac88ad84694188330efdb2 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
@@ -10588,7 +10588,8 @@ win_redr_ruler(wp, always)
            this_ru_col = (WITH_WIDTH(width) + 1) / 2;
        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
                if (has_mbyte)

diff --git a/src/version.c b/src/version.c
index 9d06ab33f497570ecb1ea94706af863a74cd539f..5c7dbd91ff194d96ea336943ef471d8658ee2a69 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    562,
 /**/
     561,
 /**/