Mercurial > vim
comparison src/screen.c @ 10538:c7f671dfd735 v8.0.0159
patch 8.0.0159: crash on startup when updating tabline
commit https://github.com/vim/vim/commit/c695cec4698b41d7b9555efdd47dda9b1945d3ae
Author: Bram Moolenaar <Bram@vim.org>
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.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 08 Jan 2017 20:15:03 +0100 |
| parents | 34b50194f82d |
| children | 206ab11fa76e |
comparison
equal
deleted
inserted
replaced
| 10537:53a18ae38edf | 10538:c7f671dfd735 |
|---|---|
| 3648 | 3648 |
| 3649 draw_state = WL_FOLD; | 3649 draw_state = WL_FOLD; |
| 3650 if (fdc > 0) | 3650 if (fdc > 0) |
| 3651 { | 3651 { |
| 3652 /* Draw the 'foldcolumn'. Allocate a buffer, "extra" may | 3652 /* Draw the 'foldcolumn'. Allocate a buffer, "extra" may |
| 3653 * already be in used. */ | 3653 * already be in use. */ |
| 3654 p_extra_free = alloc(12 + 1); | 3654 p_extra_free = alloc(12 + 1); |
| 3655 | 3655 |
| 3656 if (p_extra_free != NULL) | 3656 if (p_extra_free != NULL) |
| 3657 { | 3657 { |
| 3658 fill_foldcolumn(p_extra_free, wp, FALSE, lnum); | 3658 fill_foldcolumn(p_extra_free, wp, FALSE, lnum); |
| 10342 #ifdef FEAT_TERMGUICOLORS | 10342 #ifdef FEAT_TERMGUICOLORS |
| 10343 && !p_tgc | 10343 && !p_tgc |
| 10344 #endif | 10344 #endif |
| 10345 ); | 10345 ); |
| 10346 | 10346 |
| 10347 if (ScreenLines == NULL) | |
| 10348 return; | |
| 10347 redraw_tabline = FALSE; | 10349 redraw_tabline = FALSE; |
| 10348 | 10350 |
| 10349 #ifdef FEAT_GUI_TABLINE | 10351 #ifdef FEAT_GUI_TABLINE |
| 10350 /* Take care of a GUI tabline. */ | 10352 /* Take care of a GUI tabline. */ |
| 10351 if (gui_use_tabline()) | 10353 if (gui_use_tabline()) |