Skip to content
Permalink
Browse files

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.
  • Loading branch information...
brammool committed Jan 8, 2017
1 parent 6247361 commit c695cec4698b41d7b9555efdd47dda9b1945d3ae
Showing with 7 additions and 1 deletion.
  1. +2 −0 src/ex_getln.c
  2. +3 −1 src/screen.c
  3. +2 −0 src/version.c
@@ -772,7 +772,9 @@ getcmdline(
/*
* Open a window to edit the command line (and history).
*/
save_cmdline(&save_ccline);
c = ex_window();
restore_cmdline(&save_ccline);
some_key_typed = TRUE;
}
}
@@ -3650,7 +3650,7 @@ win_line(
if (fdc > 0)
{
/* Draw the 'foldcolumn'. Allocate a buffer, "extra" may
* already be in used. */
* already be in use. */
p_extra_free = alloc(12 + 1);

if (p_extra_free != NULL)
@@ -10344,6 +10344,8 @@ draw_tabline(void)
#endif
);

if (ScreenLines == NULL)
return;
redraw_tabline = FALSE;

#ifdef FEAT_GUI_TABLINE
@@ -764,6 +764,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
159,
/**/
158,
/**/

0 comments on commit c695cec

Please sign in to comment.
You can’t perform that action at this time.