Mercurial > vim
changeset 28275:f0e46f5bb2e7 v8.2.4663
patch 8.2.4663: occasional crash when running the GUI tests
Commit: https://github.com/vim/vim/commit/17fa233f6f88587d35310b76f48c5a26642c470a
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Apr 1 19:44:47 2022 +0100
patch 8.2.4663: occasional crash when running the GUI tests
Problem: Occasional crash when running the GUI tests.
Solution: Check that the line index is not too high. (closes https://github.com/vim/vim/issues/8681)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 01 Apr 2022 20:45:05 +0200 |
| parents | a24be734afa5 |
| children | 84ae260b2ada |
| files | src/screen.c src/version.c |
| diffstat | 2 files changed, 13 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/screen.c +++ b/src/screen.c @@ -3634,9 +3634,9 @@ win_rest_invalid(win_T *wp) /* * insert lines on the screen and update ScreenLines[] - * 'end' is the line after the scrolled part. Normally it is Rows. - * When scrolling region used 'off' is the offset from the top for the region. - * 'row' and 'end' are relative to the start of the region. + * "end" is the line after the scrolled part. Normally it is Rows. + * When scrolling region used "off" is the offset from the top for the region. + * "row" and "end" are relative to the start of the region. * * return FAIL for failure, OK for success. */ @@ -3661,14 +3661,15 @@ screen_ins_lines( /* * FAIL if * - there is no valid screen - * - the screen has to be redrawn completely * - the line count is less than one * - the line count is more than 'ttyscroll' + * - "end" is more than "Rows" (safety check, should not happen) * - redrawing for a callback and there is a modeless selection * - there is a popup window */ if (!screen_valid(TRUE) || line_count <= 0 || line_count > p_ttyscroll + || end > Rows #ifdef FEAT_CLIPBOARD || (clip_star.state != SELECT_CLEARED && redrawing_for_callback > 0) @@ -3896,13 +3897,15 @@ screen_del_lines( * - the screen has to be redrawn completely * - the line count is less than one * - the line count is more than 'ttyscroll' + * - "end" is more than "Rows" (safety check, should not happen) * - redrawing for a callback and there is a modeless selection */ - if (!screen_valid(TRUE) || line_count <= 0 - || (!force && line_count > p_ttyscroll) + if (!screen_valid(TRUE) + || line_count <= 0 + || (!force && line_count > p_ttyscroll) + || end > Rows #ifdef FEAT_CLIPBOARD - || (clip_star.state != SELECT_CLEARED - && redrawing_for_callback > 0) + || (clip_star.state != SELECT_CLEARED && redrawing_for_callback > 0) #endif ) return FAIL;