aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.1.1264: crash when closing window from WinBar click

Browse Source 
Problem:    Crash when closing window from WinBar click. (Ben Jackson)
Solution:   Check that window pointer is still valid. (closes #4337)
This commit is contained in:
Bram Moolenaar 2019-05-04 16:55:25 +02:00
parent 66f8311152
commit d2fad67e3e
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/menu.c
View File

@ -2488,7 +2488,7 @@ winbar_click(win_T *wp, int col)
if (col >= item->wb_startcol && col <= item->wb_endcol) if (col >= item->wb_startcol && col <= item->wb_endcol)
{ {
win_T *save_curwin = NULL; win_T *save_curwin = NULL;
pos_T save_visual = VIsual; pos_T save_visual = VIsual;
int save_visual_active = VIsual_active; int save_visual_active = VIsual_active;
int save_visual_select = VIsual_select; int save_visual_select = VIsual_select;
@ -2506,9 +2506,10 @@ winbar_click(win_T *wp, int col)
check_cursor(); check_cursor();
} }
// Note: the command might close the current window.
execute_menu(NULL, item->wb_menu, -1); execute_menu(NULL, item->wb_menu, -1);
if (save_curwin != NULL) if (save_curwin != NULL && win_valid(save_curwin))
{ {
curwin = save_curwin; curwin = save_curwin;
curbuf = curwin->w_buffer; curbuf = curwin->w_buffer;
@ -2518,6 +2519,8 @@ winbar_click(win_T *wp, int col)
VIsual_reselect = save_visual_reselect; VIsual_reselect = save_visual_reselect;
VIsual_mode = save_visual_mode; VIsual_mode = save_visual_mode;
} }
if (!win_valid(wp))
break;
} }
} }
} }

2
src/version.c
View File

@ -767,6 +767,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 */
/**/
1264,
/**/ /**/
1263, 1263,
/**/ /**/