IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16724 from VVKot/vim-8.2.3850

Browse Source 
vim-patch:8.2.{3850,3855}
This commit is contained in:
Jan Edmund Lazo 2021-12-25 18:24:23 -05:00 committed by GitHub
commit f7d840e295
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/regexp_nfa.c
View File

@ -2565,20 +2565,20 @@ static void nfa_print_state2(FILE *debugf, nfa_state_T *state, garray_T *indent)
ga_concat(indent, (char_u *)"| ");
else
ga_concat(indent, (char_u *)" ");
ga_append(indent, '\0');
ga_append(indent, NUL);
nfa_print_state2(debugf, state->out, indent);
/* replace last part of indent for state->out1 */
indent->ga_len -= 3;
ga_concat(indent, (char_u *)" ");
ga_append(indent, '\0');
ga_append(indent, NUL);
nfa_print_state2(debugf, state->out1, indent);
/* shrink indent */
indent->ga_len -= 3;
ga_append(indent, '\0');
ga_append(indent, NUL);
}
/*

8
src/nvim/testdir/test_blob.vim
View File

@ -346,4 +346,12 @@ func Test_blob_sort()
endif
endfunc
" The following used to cause an out-of-bounds memory access
func Test_blob2string()
let v = '0z' .. repeat('01010101.', 444)
let v ..= '01'
exe 'let b = ' .. v
call assert_equal(v, string(b))
endfunc
" vim: shiftwidth=2 sts=2 expandtab

8
src/nvim/testdir/test_messages.vim
View File

@ -108,3 +108,11 @@ func Test_echospace()
set ruler& showcmd&
endfunc
" this was missing a terminating NUL
func Test_echo_string_partial()
function CountSpaces()
endfunction
call assert_equal("function('CountSpaces', [{'ccccccccccc': ['ab', 'cd'], 'aaaaaaaaaaa': v:false, 'bbbbbbbbbbbb': ''}])", string(function('CountSpaces', [#{aaaaaaaaaaa: v:false, bbbbbbbbbbbb: '', ccccccccccc: ['ab', 'cd']}])))
endfunc