thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.2243: crash when popup mask contains zeroes

Browse Source 
Problem:    Crash when popup mask contains zeroes.
Solution:   Check boundaries properly. (closes #7569)
This commit is contained in:
Bram Moolenaar
2020-12-29 11:57:46 +01:00
parent 8242ebbdba
commit 4012d26207
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/popupwin.c
View File

@@ -3346,21 +3346,29 @@ popup_update_mask(win_T *wp, int width, int height)
cols = tv_get_number(&li->li_tv);
if (cols < 0)
cols = width + cols + 1;
if (cols <= 0)
cols = 1;
li = li->li_next;
cole = tv_get_number(&li->li_tv);
if (cole < 0)
cole = width + cole + 1;
if (cole > width)
cole = width;
li = li->li_next;
lines = tv_get_number(&li->li_tv);
if (lines < 0)
lines = height + lines + 1;
if (lines <= 0)
lines = 1;
li = li->li_next;
linee = tv_get_number(&li->li_tv);
if (linee < 0)
linee = height + linee + 1;
if (linee > height)
linee = height;
for (row = lines - 1; row < linee && row < height; ++row)
for (col = cols - 1; col < cole && col < width; ++col)
for (row = lines - 1; row < linee; ++row)
for (col = cols - 1; col < cole; ++col)
cells[row * width + col] = 1;
}
}