aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 8.2.1030: reducing size of a terminal window may cause a crash

Browse Source 
Problem:    Reducing size of a terminal window may cause a crash.
Solution:   Make sure the row and column don't become negative. (closes #6273)
This commit is contained in:
Bram Moolenaar
2020-06-21 17:57:32 +02:00
parent 23c5527373
commit da58134eed
3 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libvterm/src/screen.c
View File

@@ -646,6 +646,12 @@ static int setlineinfo(int row, const VTermLineInfo *newinfo, const VTermLineInf
newinfo->doubleheight != oldinfo->doubleheight) { newinfo->doubleheight != oldinfo->doubleheight) {
for(col = 0; col < screen->cols; col++) { for(col = 0; col < screen->cols; col++) {
ScreenCell *cell = getcell(screen, row, col); ScreenCell *cell = getcell(screen, row, col);
if (cell == NULL)
{
DEBUG_LOG2("libvterm: setlineinfo() position invalid: %d / %d",
row, col);
return 1;
}
cell->pen.dwl = newinfo->doublewidth; cell->pen.dwl = newinfo->doublewidth;
cell->pen.dhl = newinfo->doubleheight; cell->pen.dhl = newinfo->doubleheight;
} }
@@ -773,6 +779,12 @@ static size_t _get_chars(const VTermScreen *screen, const int utf8, void *buffer
ScreenCell *cell = getcell(screen, row, col); ScreenCell *cell = getcell(screen, row, col);
int i; int i;
if (cell == NULL)
{
DEBUG_LOG2("libvterm: _get_chars() position invalid: %d / %d",
row, col);
return 1;
}
if(cell->chars[0] == 0) if(cell->chars[0] == 0)
// Erased cell, might need a space // Erased cell, might need a space
padding++; padding++;

14
src/libvterm/src/state.c
View File

@@ -17,11 +17,6 @@ static void putglyph(VTermState *state, const uint32_t chars[], int width, VTerm
{ {
VTermGlyphInfo info; VTermGlyphInfo info;
if (pos.row >= state->rows)
{
DEBUG_LOG2("libvterm: putglyph() pos.row %d out of range (rows = %d)\n", pos.row, state.rows);
return;
}
info.chars = chars; info.chars = chars;
info.width = width; info.width = width;
info.protected_cell = state->protected_cell; info.protected_cell = state->protected_cell;
@@ -289,11 +284,6 @@ static int on_text(const char bytes[], size_t len, void *user)
VTermPos oldpos = state->pos; VTermPos oldpos = state->pos;
if (state->pos.row >= state->rows)
{
DEBUG_LOG2("libvterm: on_text() pos.row %d out of range (rows = %d)\n", state->pos.row, state->rows);
return 0;
}
// We'll have at most len codepoints, plus one from a previous incomplete // We'll have at most len codepoints, plus one from a previous incomplete
// sequence. // sequence.
codepoints = vterm_allocator_malloc(state->vt, (len + 1) * sizeof(uint32_t)); codepoints = vterm_allocator_malloc(state->vt, (len + 1) * sizeof(uint32_t));
@@ -1856,8 +1846,12 @@ static int on_resize(int rows, int cols, void *user)
if(state->pos.row >= rows) if(state->pos.row >= rows)
state->pos.row = rows - 1; state->pos.row = rows - 1;
if(state->pos.row < 0)
state->pos.row = 0;
if(state->pos.col >= cols) if(state->pos.col >= cols)
state->pos.col = cols - 1; state->pos.col = cols - 1;
if(state->pos.col < 0)
state->pos.col = 0;
updatecursor(state, &oldpos, 1); updatecursor(state, &oldpos, 1);

2
src/version.c
View File

@@ -754,6 +754,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 */
/**/
1030,
/**/ /**/
1029, 1029,
/**/ /**/