From: Bram Moolenaar Date: Mon, 4 May 2015 14:10:26 +0000 (+0200) Subject: patch 7.4.719 X-Git-Tag: v7.4.719 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=c4dc286fe67f385043efddca1bb7196619df8fb2;p=thirdparty%2Fvim.git patch 7.4.719 Problem: Overflow when adding MAXCOL to a pointer. Solution: Subtract pointers instead. (James McCoy) --- diff --git a/src/screen.c b/src/screen.c index f9a847dbde..a0e9fc9fb9 100644 --- a/src/screen.c +++ b/src/screen.c @@ -4341,7 +4341,7 @@ win_line(wp, lnum, startrow, endrow, nochange) || (mb_utf8 && mb_c == 160) #endif ) && lcs_nbsp) - || (c == ' ' && lcs_space && ptr <= line + trailcol))) + || (c == ' ' && lcs_space && ptr - line <= trailcol))) { c = (c == ' ') ? lcs_space : lcs_nbsp; if (area_attr == 0 && search_attr == 0) diff --git a/src/version.c b/src/version.c index ab9d100af9..61bd602fe7 100644 --- 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 */ +/**/ + 719, /**/ 718, /**/