0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

patch 8.2.0118: crash when cycling to buffers involving popup window

Problem:    Crash when cycling to buffers involving popup window .
Solution:   Do not decrement buffer reference count.
This commit is contained in:
Bram Moolenaar
2020-01-14 20:42:48 +01:00
parent 8024f93636
commit ca7c078b79
4 changed files with 28 additions and 8 deletions

View File

@@ -937,10 +937,7 @@ apply_options(win_T *wp, dict_T *dict)
nr = dict_get_number(dict, (char_u *)"hidden");
if (nr > 0)
{
wp->w_popup_flags |= POPF_HIDDEN;
--wp->w_buffer->b_nwindows;
}
popup_mask_refresh = TRUE;
popup_highlight_curline(wp);
@@ -1153,7 +1150,6 @@ popup_adjust_position(win_T *wp)
if ((wp->w_popup_flags & POPF_HIDDEN) == 0)
{
wp->w_popup_flags |= POPF_HIDDEN;
--wp->w_buffer->b_nwindows;
if (win_valid(wp->w_popup_prop_win))
redraw_win_later(wp->w_popup_prop_win, SOME_VALID);
}
@@ -2351,7 +2347,7 @@ popup_hide(win_T *wp)
if ((wp->w_popup_flags & POPF_HIDDEN) == 0)
{
wp->w_popup_flags |= POPF_HIDDEN;
--wp->w_buffer->b_nwindows;
// Do not decrement b_nwindows, we still reference the buffer.
redraw_all_later(NOT_VALID);
popup_mask_refresh = TRUE;
}
@@ -2376,7 +2372,6 @@ popup_show(win_T *wp)
if ((wp->w_popup_flags & POPF_HIDDEN) != 0)
{
wp->w_popup_flags &= ~POPF_HIDDEN;
++wp->w_buffer->b_nwindows;
redraw_all_later(NOT_VALID);
popup_mask_refresh = TRUE;
}
@@ -3154,7 +3149,6 @@ check_popup_unhidden(win_T *wp)
&prop, &lnum) == OK)
{
wp->w_popup_flags &= ~POPF_HIDDEN;
++wp->w_buffer->b_nwindows;
wp->w_popup_prop_topline = 0; // force repositioning
return TRUE;
}