diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-12-25 18:24:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-25 18:24:23 -0500 |
| commit | f7d840e295ad8516a9f793fefd0c232a777e65a7 (patch) | |
| tree | 5cc2c4f2ba5bcb69b2304b0b5b63898477c4fad0 | |
| parent | 7622f1afe9b7bb59cefb12fc0e3d708ff02c3343 (diff) | |
| parent | 6f72236a001d3b9d4780235ba620c8a1e04f88c9 (diff) | |
| download | rneovim-f7d840e295ad8516a9f793fefd0c232a777e65a7.tar.gz rneovim-f7d840e295ad8516a9f793fefd0c232a777e65a7.tar.bz2 rneovim-f7d840e295ad8516a9f793fefd0c232a777e65a7.zip | |
Merge pull request #16724 from VVKot/vim-8.2.3850
vim-patch:8.2.{3850,3855}
| -rw-r--r-- | src/nvim/regexp_nfa.c | 6 | ||||
| -rw-r--r-- | src/nvim/testdir/test_blob.vim | 8 | ||||
| -rw-r--r-- | src/nvim/testdir/test_messages.vim | 8 |
3 files changed, 19 insertions, 3 deletions
diff --git a/src/nvim/regexp_nfa.c b/src/nvim/regexp_nfa.c index eac1b4596e..41c927eaa6 100644 --- a/src/nvim/regexp_nfa.c +++ b/src/nvim/regexp_nfa.c @@ -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); } /* diff --git a/src/nvim/testdir/test_blob.vim b/src/nvim/testdir/test_blob.vim index 20758b0c0a..af42b3857d 100644 --- a/src/nvim/testdir/test_blob.vim +++ b/src/nvim/testdir/test_blob.vim @@ -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 diff --git a/src/nvim/testdir/test_messages.vim b/src/nvim/testdir/test_messages.vim index 2140fe21ea..e0286548d9 100644 --- a/src/nvim/testdir/test_messages.vim +++ b/src/nvim/testdir/test_messages.vim @@ -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 + |