aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2024-01-30 07:34:37 +0800
committerGitHub <noreply@github.com>2024-01-30 07:34:37 +0800
commita2070ba8773ca264f68a4cfb50cb3d12219838e7 (patch)
tree57ab3803bb61f7070d5227ef61c71be21090af9f /src
parentbe5cf338362244a944cdeebf07520f85d7d93226 (diff)
downloadrneovim-a2070ba8773ca264f68a4cfb50cb3d12219838e7.tar.gz
rneovim-a2070ba8773ca264f68a4cfb50cb3d12219838e7.tar.bz2
rneovim-a2070ba8773ca264f68a4cfb50cb3d12219838e7.zip
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 <cb@256bit.org>
Diffstat (limited to 'src')
-rw-r--r--src/nvim/insexpand.c8
1 files changed, 5 insertions, 3 deletions
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();