thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.0678: rare crash for popup menu

Browse Source 
Problem:    Rare crash for popup menu.
Solution:   Check for NULL pointer. (Nobuhiro Takasaki, closes #6027)
This commit is contained in:
Bram Moolenaar
2020-05-02 14:52:57 +02:00
parent c8cd2b34d1
commit d58a662f44
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/popupmenu.c
View File

@@ -60,9 +60,12 @@ pum_compute_size(void)
pum_extra_width = 0; pum_extra_width = 0;
for (i = 0; i < pum_size; ++i) for (i = 0; i < pum_size; ++i)
{ {
w = vim_strsize(pum_array[i].pum_text); if (pum_array[i].pum_text != NULL)
if (pum_base_width < w) {
pum_base_width = w; w = vim_strsize(pum_array[i].pum_text);
if (pum_base_width < w)
pum_base_width = w;
}
if (pum_array[i].pum_kind != NULL) if (pum_array[i].pum_kind != NULL)
{ {
w = vim_strsize(pum_array[i].pum_kind) + 1; w = vim_strsize(pum_array[i].pum_kind) + 1;

2
src/version.c
View File

@@ -746,6 +746,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 */
/**/
678,
/**/ /**/
677, 677,
/**/ /**/