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

patch 9.0.0309: invalid memory access when cmdheight is zero

Browse Source 
Problem:    Invalid memory access when cmdheight is zero.
Solution:   Check index in w_lines is smaller than Rows.
This commit is contained in:
Bram Moolenaar 2022-08-28 22:21:01 +01:00
parent 33a5dd8b23
commit 7a99da43d1
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/drawscreen.c
View File

@ -830,6 +830,9 @@ after_updating_screen(int may_resize_shell UNUSED)
// handle the drop now. // handle the drop now.
handle_any_postponed_drop(); handle_any_postponed_drop();
#endif #endif
// in case it was changed in dont_use_message_window()
cmdline_row = Rows - p_ch;
} }
/* /*
@ -2426,7 +2429,8 @@ win_update(win_T *wp)
if (wp->w_lines_valid > wp->w_height) if (wp->w_lines_valid > wp->w_height)
wp->w_lines_valid = wp->w_height; wp->w_lines_valid = wp->w_height;
for (i = wp->w_lines_valid; i - j >= idx; --i) for (i = wp->w_lines_valid; i - j >= idx; --i)
wp->w_lines[i] = wp->w_lines[i - j]; if (i < Rows)
wp->w_lines[i] = wp->w_lines[i - j];
// The w_lines[] entries for inserted lines are // The w_lines[] entries for inserted lines are
// now invalid, but wl_size may be used above. // now invalid, but wl_size may be used above.

2
src/version.c
View File

@ -707,6 +707,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 */
/**/
309,
/**/ /**/
308, 308,
/**/ /**/