From a2070ba8773ca264f68a4cfb50cb3d12219838e7 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Tue, 30 Jan 2024 07:34:37 +0800 Subject: vim-patch:9.1.0065: Segfault with CompleteChanged autocommand (#27261) Problem: Segfault with CompleteChanged autocommand (markonm ) Solution: Test match->cp_prev for being NULL before accessing it closes: vim/vim#13929 https://github.com/vim/vim/commit/fef66301665027f1801a18d796f74584666f41ef Co-authored-by: Christian Brabandt --- src/nvim/insexpand.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/nvim/insexpand.c b/src/nvim/insexpand.c index 08de7ac6f6..82b26ba802 100644 --- a/src/nvim/insexpand.c +++ b/src/nvim/insexpand.c @@ -2760,9 +2760,11 @@ static int info_add_completion_info(list_T *li) // Skip the element with the CP_ORIGINAL_TEXT flag at the beginning, in case of // forward completion, or at the end, in case of backward completion. - match = forward ? match->cp_next - : (compl_no_select && match_at_original_text(match) - ? match->cp_prev : match->cp_prev->cp_prev); + match = (forward || match->cp_prev == NULL + ? match->cp_next + : (compl_no_select && match_at_original_text(match) + ? match->cp_prev + : match->cp_prev->cp_prev)); while (match != NULL && !match_at_original_text(match)) { dict_T *di = tv_dict_alloc(); -- cgit