mirror of
https://github.com/vim/vim.git
synced 2025-09-25 03:54:15 -04:00
patch 8.0.0159: crash on startup when updating tabline
Problem: Using a NULL pointer when using feedkeys() to trigger drawing a tabline. Solution: Skip drawing a tabline if TabPageIdxs is NULL. (Dominique Pelle) Also fix recursing into getcmdline() from the cmd window.
This commit is contained in:
@@ -772,7 +772,9 @@ getcmdline(
|
|||||||
/*
|
/*
|
||||||
* Open a window to edit the command line (and history).
|
* Open a window to edit the command line (and history).
|
||||||
*/
|
*/
|
||||||
|
save_cmdline(&save_ccline);
|
||||||
c = ex_window();
|
c = ex_window();
|
||||||
|
restore_cmdline(&save_ccline);
|
||||||
some_key_typed = TRUE;
|
some_key_typed = TRUE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -3650,7 +3650,7 @@ win_line(
|
|||||||
if (fdc > 0)
|
if (fdc > 0)
|
||||||
{
|
{
|
||||||
/* Draw the 'foldcolumn'. Allocate a buffer, "extra" may
|
/* Draw the 'foldcolumn'. Allocate a buffer, "extra" may
|
||||||
* already be in used. */
|
* already be in use. */
|
||||||
p_extra_free = alloc(12 + 1);
|
p_extra_free = alloc(12 + 1);
|
||||||
|
|
||||||
if (p_extra_free != NULL)
|
if (p_extra_free != NULL)
|
||||||
@@ -10344,6 +10344,8 @@ draw_tabline(void)
|
|||||||
#endif
|
#endif
|
||||||
);
|
);
|
||||||
|
|
||||||
|
if (ScreenLines == NULL)
|
||||||
|
return;
|
||||||
redraw_tabline = FALSE;
|
redraw_tabline = FALSE;
|
||||||
|
|
||||||
#ifdef FEAT_GUI_TABLINE
|
#ifdef FEAT_GUI_TABLINE
|
||||||
|
@@ -764,6 +764,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 */
|
||||||
|
/**/
|
||||||
|
159,
|
||||||
/**/
|
/**/
|
||||||
158,
|
158,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user