mirror of
https://github.com/neovim/neovim.git
synced 2025-09-24 03:58:32 +00:00
vim-patch:7.4.719 #2817
Problem: Overflow when adding MAXCOL to a pointer. Solution: Subtract pointers instead. (James McCoy) https://github.com/vim/vim/commit/v7-4-719
This commit is contained in:

committed by
Justin M. Keyes

parent
f04bc91c2f
commit
8992f8b1c7
@@ -3173,7 +3173,7 @@ win_line (
|
|||||||
// 'list': change char 160 to lcs_nbsp and space to lcs_space.
|
// 'list': change char 160 to lcs_nbsp and space to lcs_space.
|
||||||
if (wp->w_p_list
|
if (wp->w_p_list
|
||||||
&& (((c == 160 || (mb_utf8 && mb_c == 160)) && lcs_nbsp)
|
&& (((c == 160 || (mb_utf8 && mb_c == 160)) && 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) {
|
||||||
n_attr = 1;
|
n_attr = 1;
|
||||||
|
@@ -90,7 +90,7 @@ static int included_patches[] = {
|
|||||||
//722,
|
//722,
|
||||||
//721,
|
//721,
|
||||||
//720 NA
|
//720 NA
|
||||||
//719,
|
719,
|
||||||
//718,
|
//718,
|
||||||
//717,
|
//717,
|
||||||
//716,
|
//716,
|
||||||
|
Reference in New Issue
Block a user