# HG changeset patch # User Christian Brabandt # Date 1483902903 -3600 # Node ID c7f671dfd735d5ed8a2a2b14cf1fba183d063596 # Parent 53a18ae38edf5f5c1d2e0caeb886e2815707ed4f patch 8.0.0159: crash on startup when updating tabline commit https://github.com/vim/vim/commit/c695cec4698b41d7b9555efdd47dda9b1945d3ae Author: Bram Moolenaar Date: Sun Jan 8 20:00:04 2017 +0100 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. diff --git a/src/ex_getln.c b/src/ex_getln.c --- a/src/ex_getln.c +++ b/src/ex_getln.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; } } diff --git a/src/screen.c b/src/screen.c --- a/src/screen.c +++ b/src/screen.c @@ -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 diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 159, +/**/ 158, /**/ 157,