diff options
| author | VVKot <volodymyr.kot.ua@gmail.com> | 2021-12-19 19:49:03 +0000 |
|---|---|---|
| committer | VVKot <volodymyr.kot.ua@gmail.com> | 2021-12-19 19:50:59 +0000 |
| commit | 6f72236a001d3b9d4780235ba620c8a1e04f88c9 (patch) | |
| tree | 3a3b4e564da217ab9d76db36349adc7c2d4aa07b | |
| parent | bdfca2028b69e054eaee2b97e6bbfc955a29e76a (diff) | |
| download | rneovim-6f72236a001d3b9d4780235ba620c8a1e04f88c9.tar.gz rneovim-6f72236a001d3b9d4780235ba620c8a1e04f88c9.tar.bz2 rneovim-6f72236a001d3b9d4780235ba620c8a1e04f88c9.zip | |
vim-patch:8.2.3855: illegal memory access when displaying a blob
Problem: Illegal memory access when displaying a blob.
Solution: Append a NUL at the end. (Yegappan Lakshmanan, closes vim/vim#9372)
https://github.com/vim/vim/commit/bc404bfb32cf2bef34050d2aeae0ea72ccf980cc
| -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 | 2 |
3 files changed, 12 insertions, 4 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 4ba9d28868..e0286548d9 100644 --- a/src/nvim/testdir/test_messages.vim +++ b/src/nvim/testdir/test_messages.vim @@ -113,6 +113,6 @@ endfunc func Test_echo_string_partial() function CountSpaces() endfunction - echomsg function('CountSpaces', [#{aaaaaaaaaaa: v:false, bbbbbbbbbbbb: '', ccccccccccc: ['ab', 'cd']}]) + call assert_equal("function('CountSpaces', [{'ccccccccccc': ['ab', 'cd'], 'aaaaaaaaaaa': v:false, 'bbbbbbbbbbbb': ''}])", string(function('CountSpaces', [#{aaaaaaaaaaa: v:false, bbbbbbbbbbbb: '', ccccccccccc: ['ab', 'cd']}]))) endfunc |