patch 8.1.2420: crash when calling popup_close() in win_execute()
Problem: Crash when calling popup_close() in win_execute().
Solution: Disallow popup_close() in popup window. (Yasuhiro Matsumoto,
closes #5345)
diff --git a/src/popupwin.c b/src/popupwin.c
index dc09ef3..e65b4bf 100644
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -1753,7 +1753,7 @@
// Check that arguments look OK.
if (argvars[0].v_type == VAR_NUMBER)
{
- buf = buflist_findnr( argvars[0].vval.v_number);
+ buf = buflist_findnr(argvars[0].vval.v_number);
if (buf == NULL)
{
semsg(_(e_nobufnr), argvars[0].vval.v_number);
@@ -2097,6 +2097,10 @@
{
int id = wp->w_id;
+ // Just in case a check higher up is missing.
+ if (wp == curwin && ERROR_IF_POPUP_WINDOW)
+ return;
+
if (wp->w_close_cb.cb_name != NULL)
// Careful: This may make "wp" invalid.
invoke_popup_callback(wp, arg);
@@ -2331,8 +2335,12 @@
f_popup_close(typval_T *argvars, typval_T *rettv UNUSED)
{
int id = (int)tv_get_number(argvars);
- win_T *wp = find_popup_win(id);
+ win_T *wp;
+ if (ERROR_IF_POPUP_WINDOW)
+ return;
+
+ wp = find_popup_win(id);
if (wp != NULL)
popup_close_and_callback(wp, &argvars[1]);
}