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

patch 8.1.1497: accessing memory beyond allocated space

Browse Source 
Problem:    Accessing memory beyond allocated space.
Solution:   Check column before accessing popup mask.
This commit is contained in:
Bram Moolenaar
2019-06-08 17:25:33 +02:00
parent acc682bd7c
commit aef5c62a6f
2 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/screen.c
View File

@@ -6797,35 +6797,40 @@ screen_line(
if (clear_width > 0
#ifdef FEAT_TEXT_PROP
&& !(flags & SLF_POPUP) // no separator for popup window
&& popup_mask[row * screen_Columns + col + coloff] <= screen_zindex
#endif
)
{
// For a window that has a right neighbor, draw the separator char
// right of the window contents.
// right of the window contents. But not on top of a popup window.
if (coloff + col < Columns)
{
int c;
c = fillchar_vsep(&hl);
if (ScreenLines[off_to] != (schar_T)c
|| (enc_utf8 && (int)ScreenLinesUC[off_to]
!= (c >= 0x80 ? c : 0))
|| ScreenAttrs[off_to] != hl)
#ifdef FEAT_TEXT_PROP
if (popup_mask[row * screen_Columns + col + coloff]
<= screen_zindex)
#endif
{
ScreenLines[off_to] = c;
ScreenAttrs[off_to] = hl;
if (enc_utf8)
int c;
c = fillchar_vsep(&hl);
if (ScreenLines[off_to] != (schar_T)c
|| (enc_utf8 && (int)ScreenLinesUC[off_to]
!= (c >= 0x80 ? c : 0))
|| ScreenAttrs[off_to] != hl)
{
if (c >= 0x80)
ScreenLines[off_to] = c;
ScreenAttrs[off_to] = hl;
if (enc_utf8)
{
ScreenLinesUC[off_to] = c;
ScreenLinesC[0][off_to] = 0;
if (c >= 0x80)
{
ScreenLinesUC[off_to] = c;
ScreenLinesC[0][off_to] = 0;
}
else
ScreenLinesUC[off_to] = 0;
}
else
ScreenLinesUC[off_to] = 0;
screen_char(off_to, row, col + coloff);
}
screen_char(off_to, row, col + coloff);
}
}
else

2
src/version.c
View File

@@ -767,6 +767,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1497,
/**/
1496,
/**/