patch 8.2.0371: crash with combination of terminal popup and autocmd
Problem: Crash with combination of terminal popup and autocmd.
Solution: Disallow closing a popup that is the current window. Add a check
that the current buffer is valid. (closes #5754)
diff --git a/src/popupwin.c b/src/popupwin.c
index 3c85e3d..1b56c1c 100644
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -2135,7 +2135,7 @@
break;
if (owp != NULL)
win_enter(owp, FALSE);
- else if (win_valid(prevwin))
+ else if (win_valid(prevwin) && wp != prevwin)
win_enter(prevwin, FALSE);
else
win_enter(firstwin, FALSE);
@@ -2147,11 +2147,13 @@
if (wp == curwin && ERROR_IF_POPUP_WINDOW)
return;
+ CHECK_CURBUF;
if (wp->w_close_cb.cb_name != NULL)
// Careful: This may make "wp" invalid.
invoke_popup_callback(wp, arg);
popup_close(id);
+ CHECK_CURBUF;
}
void
@@ -2505,6 +2507,11 @@
for (wp = first_popupwin; wp != NULL; prev = wp, wp = wp->w_next)
if (wp->w_id == id)
{
+ if (wp == curwin)
+ {
+ ERROR_IF_ANY_POPUP_WINDOW;
+ return;
+ }
if (prev == NULL)
first_popupwin = wp->w_next;
else
@@ -2531,6 +2538,11 @@
for (wp = *root; wp != NULL; prev = wp, wp = wp->w_next)
if (wp->w_id == id)
{
+ if (wp == curwin)
+ {
+ ERROR_IF_ANY_POPUP_WINDOW;
+ return;
+ }
if (prev == NULL)
*root = wp->w_next;
else
@@ -2881,10 +2893,11 @@
{
// win_execute() may set "curwin" to a popup window temporarily, but many
// commands are disallowed then. When a terminal runs in the popup most
- // things are allowed.
+ // things are allowed. When a terminal is finished it can be closed.
if (WIN_IS_POPUP(curwin)
# ifdef FEAT_TERMINAL
&& (also_with_term || curbuf->b_term == NULL)
+ && !term_is_finished(curbuf)
# endif
)
{