patch 9.0.1030: using freed memory with the cmdline popup menu
Problem: Using freed memory with the cmdline popup menu.
Solution: Clear the popup menu when clearing the matches. (closes #11677)
diff --git a/src/cmdexpand.c b/src/cmdexpand.c
index 228d4bc..3e2ecb3 100644
--- a/src/cmdexpand.c
+++ b/src/cmdexpand.c
@@ -369,7 +369,8 @@
/*
* Display the cmdline completion matches in a popup menu
*/
-void cmdline_pum_display(void)
+ void
+cmdline_pum_display(void)
{
pum_display(compl_match_array, compl_match_arraysize, compl_selected);
}
@@ -377,7 +378,8 @@
/*
* Returns TRUE if the cmdline completion popup menu is being displayed.
*/
-int cmdline_pum_active(void)
+ int
+cmdline_pum_active(void)
{
return pum_visible() && compl_match_array != NULL;
}
@@ -386,7 +388,8 @@
* Remove the cmdline completion popup menu (if present), free the list of
* items and refresh the screen.
*/
-void cmdline_pum_remove(void)
+ void
+cmdline_pum_remove(void)
{
int save_p_lz = p_lz;
int save_KeyTyped = KeyTyped;
@@ -403,7 +406,8 @@
KeyTyped = save_KeyTyped;
}
-void cmdline_pum_cleanup(cmdline_info_T *cclp)
+ void
+cmdline_pum_cleanup(cmdline_info_T *cclp)
{
cmdline_pum_remove();
wildmenu_cleanup(cclp);
@@ -413,7 +417,8 @@
* Returns the starting column number to use for the cmdline completion popup
* menu.
*/
-int cmdline_compl_startcol(void)
+ int
+cmdline_compl_startcol(void)
{
return compl_startcol;
}
@@ -975,6 +980,10 @@
FreeWild(xp->xp_numfiles, xp->xp_files);
xp->xp_numfiles = -1;
VIM_CLEAR(orig_save);
+
+ // The entries from xp_files may be used in the PUM, remove it.
+ if (compl_match_array != NULL)
+ cmdline_pum_remove();
}
findex = 0;