mirror of
https://github.com/neovim/neovim.git
synced 2026-08-25 00:21:55 +00:00
Merge pull request #37403 from zeertzjq/vim-9.1.0700
vim-patch:9.1.{0700,0701,0702,0703}
This commit is contained in:
@@ -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/heap_overflow_glob2regpat
Normal file
BIN
test/old/testdir/crash/heap_overflow_glob2regpat
Normal file
Binary file not shown.
BIN
test/old/testdir/crash/nullptr_regexp_nfa
Normal file
BIN
test/old/testdir/crash/nullptr_regexp_nfa
Normal file
Binary file not shown.
@@ -226,6 +226,17 @@ func Test_crash1_3()
|
||||
call term_sendkeys(buf, args)
|
||||
call TermWait(buf, 150)
|
||||
|
||||
let file = 'crash/heap_overflow_glob2regpat'
|
||||
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)
|
||||
|
||||
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!"
|
||||
|
||||
Reference in New Issue
Block a user