Mercurial > vim
changeset 27158:a89cf47ba8ed v8.2.4108
patch 8.2.4108: going over the end of the w_lines array
Commit: https://github.com/vim/vim/commit/f6ebc820041b3f77794297026b46c1ebbc279a3a
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jan 16 13:58:33 2022 +0000
patch 8.2.4108: going over the end of the w_lines array
Problem: Going over the end of the w_lines array.
Solution: Check not going over the end and limit to Rows. (issue https://github.com/vim/vim/issues/9540)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 16 Jan 2022 15:00:04 +0100 |
| parents | 18eff22f94bd |
| children | d0a330b84595 |
| files | src/drawscreen.c src/version.c |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/drawscreen.c +++ b/src/drawscreen.c @@ -1815,10 +1815,11 @@ win_update(win_T *wp) // When topline didn't change, find first entry in w_lines[] that // needs updating. - // try to find wp->w_topline in wp->w_lines[].wl_lnum + // Try to find wp->w_topline in wp->w_lines[].wl_lnum. The check + // for "Rows" is in case "wl_size" is incorrect somehow. j = -1; row = 0; - for (i = 0; i < wp->w_lines_valid; i++) + for (i = 0; i < wp->w_lines_valid && i < Rows; i++) { if (wp->w_lines[i].wl_valid && wp->w_lines[i].wl_lnum == wp->w_topline) @@ -1848,6 +1849,8 @@ win_update(win_T *wp) // ... but don't delete new filler lines. row -= wp->w_topfill; #endif + if (row > Rows) // just in case + row = Rows; if (row > 0) { check_for_delay(FALSE);