From bc29283f209db7a7de3c999af2780c3d5a30ebae Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Sat, 2 May 2020 16:23:30 -0400 Subject: vim-patch:8.2.0678: rare crash for popup menu Problem: Rare crash for popup menu. Solution: Check for NULL pointer. (Nobuhiro Takasaki, closes vim/vim#6027) https://github.com/vim/vim/commit/d58a662f44dc11475f4cf5922a948635da934cc4 --- src/nvim/popupmnu.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/nvim/popupmnu.c b/src/nvim/popupmnu.c index 532bf68190..e06433892d 100644 --- a/src/nvim/popupmnu.c +++ b/src/nvim/popupmnu.c @@ -63,9 +63,12 @@ static void pum_compute_size(void) pum_kind_width = 0; pum_extra_width = 0; for (int i = 0; i < pum_size; i++) { - int w = vim_strsize(pum_array[i].pum_text); - if (pum_base_width < w) { - pum_base_width = w; + int w; + if (pum_array[i].pum_text != NULL) { + w = vim_strsize(pum_array[i].pum_text); + if (pum_base_width < w) { + pum_base_width = w; + } } if (pum_array[i].pum_kind != NULL) { w = vim_strsize(pum_array[i].pum_kind) + 1; -- cgit