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 37182e1..0d14706 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -4409,6 +4409,8 @@
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 e7b8e78..290dd1b 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -10588,7 +10588,8 @@
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 9d06ab3..5c7dbd9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 562,
+/**/
561,
/**/
560,