Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

updated for version 7.3.472

Problem:    Crash when using ":redraw" in a BufEnter autocommand and
	    switching to another tab. (驼峰)
Solution:   Move triggering the the autocommands to after correcting the
	    option values. Also check the row value to be out of bounds.
	    (Christian Brabandt, Sergey Khorev)
  • Loading branch information...
commit b7314625c54b75ba54057000d04660ad7f278f09 1 parent 9c5236f
Bram Moolenaar authored
Showing with 16 additions and 7 deletions.
  1. +6 −0 src/screen.c
  2. +2 −0  src/version.c
  3. +8 −7 src/window.c
View
6 src/screen.c
@@ -5371,6 +5371,12 @@ screen_line(row, coloff, endcol, clear_width
# define CHAR_CELLS 1
#endif
+ /* Check for illegal row and col, just in case. */
+ if (row >= Rows)
+ row = Rows - 1;
+ if (endcol > Columns)
+ endcol = Columns;
+
# ifdef FEAT_CLIPBOARD
clip_may_clear_selection(row, row);
# endif
View
2  src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 472,
+/**/
471,
/**/
470,
View
15 src/window.c
@@ -3676,13 +3676,6 @@ enter_tabpage(tp, old_curbuf)
win_enter_ext(tp->tp_curwin, FALSE, TRUE);
prevwin = next_prevwin;
-#ifdef FEAT_AUTOCMD
- apply_autocmds(EVENT_TABENTER, NULL, NULL, FALSE, curbuf);
-
- if (old_curbuf != curbuf)
- apply_autocmds(EVENT_BUFENTER, NULL, NULL, FALSE, curbuf);
-#endif
-
last_status(FALSE); /* status line may appear or disappear */
(void)win_comp_pos(); /* recompute w_winrow for all windows */
must_redraw = CLEAR; /* need to redraw everything */
@@ -3712,6 +3705,14 @@ enter_tabpage(tp, old_curbuf)
gui_may_update_scrollbars();
#endif
+#ifdef FEAT_AUTOCMD
+ /* Apply autocommands after updating the display, when 'rows' and
+ * 'columns' have been set correctly. */
+ apply_autocmds(EVENT_TABENTER, NULL, NULL, FALSE, curbuf);
+ if (old_curbuf != curbuf)
+ apply_autocmds(EVENT_BUFENTER, NULL, NULL, FALSE, curbuf);
+#endif
+
redraw_all_later(CLEAR);
}
Please sign in to comment.
Something went wrong with that request. Please try again.