0
0
mirror of https://github.com/vim/vim.git synced 2025-09-30 04:44:14 -04:00

patch 7.4.719

Problem:    Overflow when adding MAXCOL to a pointer.
Solution:   Subtract pointers instead. (James McCoy)
This commit is contained in:
Bram Moolenaar
2015-05-04 16:10:26 +02:00
parent 81278efadf
commit c4dc286fe6
2 changed files with 3 additions and 1 deletions

View File

@@ -4341,7 +4341,7 @@ win_line(wp, lnum, startrow, endrow, nochange)
|| (mb_utf8 && mb_c == 160) || (mb_utf8 && mb_c == 160)
#endif #endif
) && lcs_nbsp) ) && lcs_nbsp)
|| (c == ' ' && lcs_space && ptr <= line + trailcol))) || (c == ' ' && lcs_space && ptr - line <= trailcol)))
{ {
c = (c == ' ') ? lcs_space : lcs_nbsp; c = (c == ' ') ? lcs_space : lcs_nbsp;
if (area_attr == 0 && search_attr == 0) if (area_attr == 0 && search_attr == 0)

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 */
/**/
719,
/**/ /**/
718, 718,
/**/ /**/