aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-08-30 20:43:35 -04:00
Code

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: #15583

Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Christian Brabandt 2024-08-28 23:17:52 +02:00
parent 1c815b54bb
commit c3a02d78bd
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
4 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/regexp_nfa.c
View File

@ -6525,7 +6525,8 @@ nfa_regmatch(
else
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
src/testdir/crash/nullptr_regexp_nfa Normal file
View File

Binary file not shown.

5
src/testdir/test_crash.vim
View File

@ -228,6 +228,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!"

2
src/version.c
View File

@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
701,
/**/
700,
/**/