mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-04-02 13:49:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.0701: crash with NFA regex engine when searching for composing chars

Browse Source 
Problem:  crash with NFA regex engine when searching for composing chars
          (SuyueGuo)
Solution: When there is no composing character, break out of the loop
          and check that out1 state is not null

fixes: vim/vim#15583

c3a02d78bd

Test uses DBCS 'encoding', which is N/A.

Co-authored-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq
2026-01-15 13:56:05 +08:00
parent 11b3699252
commit 0de85e322a
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/regexp.c
View File

@@ -14799,7 +14799,8 @@ static int nfa_regmatch(nfa_regprog_T *prog, nfa_state_T *start, regsubs_T *subm
result = FAIL;
}
if (t->state->out->out1->c == NFA_END_COMPOSING) {
if (t->state->out->out1 != NULL
&& t->state->out->out1->c == NFA_END_COMPOSING) {
end = t->state->out->out1;
ADD_STATE_IF_MATCH(end);
}

BIN
test/old/testdir/crash/nullptr_regexp_nfa Normal file
View File

Binary file not shown.

5
test/old/testdir/test_crash.vim
View File

@@ -232,6 +232,11 @@ func Test_crash1_3()
call term_sendkeys(buf, args)
call TermWait(buf, 50)
let file = 'crash/nullptr_regexp_nfa'
let cmn_args = "%s -u NONE -i NONE -n -X -m -n -e -s -S %s -c ':qa!'"
let args = printf(cmn_args, vim, file)
call term_sendkeys(buf, args)
call TermWait(buf, 50)
" clean up
exe buf .. "bw!"