Mercurial > vim
view src/testdir/test_wordcount.vim @ 33815:08f9e1eac4cf v9.0.2123
patch 9.0.2123: Problem with initializing the length of range() lists
Commit: https://github.com/vim/vim/commit/df63da98d8dc284b1c76cfe1b17fa0acbd6094d8
Author: Christian Brabandt <cb@256bit.org>
Date: Thu Nov 23 20:14:28 2023 +0100
patch 9.0.2123: Problem with initializing the length of range() lists
Problem: Problem with initializing the length of range() lists
Solution: Set length explicitly when it shouldn't contain any items
range() may cause a wrong calculation of list length, which may later
then cause a segfault in list_find(). This is usually not a problem,
because range_list_materialize() calculates the length, when it
materializes the list.
In addition, in list_find() when the length of the range was wrongly
initialized, it may seem to be valid, so the check for list index
out-of-bounds will not be true, because it is called before the list is
actually materialized. And so we may eventually try to access a null
pointer, causing a segfault.
So this patch does 3 things:
- In f_range(), when we know that the list should be empty, explicitly
set the list->lv_len value to zero. This should happen, when
start is larger than end (in case the stride is positive) or
end is larger than start when the stride is negative.
This should fix the underlying issue properly. However,
- as a safety measure, let's check that the requested index is not
out of range one more time, after the list has been materialized
and return NULL in case it suddenly is.
- add a few more tests to verify the behaviour.
fixes: #13557
closes: #13563
Co-authored-by: Tim Pope <tpope@github.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Thu, 23 Nov 2023 20:30:07 +0100 |
parents | 08940efa6b4e |
children |
line wrap: on
line source
" Test for wordcount() function func Test_wordcount() let save_enc = &enc set encoding=utf-8 set selection=inclusive fileformat=unix fileformats=unix new " Test 1: empty window call assert_equal({'chars': 0, 'cursor_chars': 0, 'words': 0, 'cursor_words': 0, \ 'bytes': 0, 'cursor_bytes': 0}, wordcount()) " Test 2: some words, cursor at start call append(1, 'one two three') call cursor([1, 1, 0]) call assert_equal({'chars': 15, 'cursor_chars': 1, 'words': 3, 'cursor_words': 0, \ 'bytes': 15, 'cursor_bytes': 1}, wordcount()) " Test 3: some words, cursor at end %d _ call append(1, 'one two three') call cursor([2, 99, 0]) call assert_equal({'chars': 15, 'cursor_chars': 14, 'words': 3, 'cursor_words': 3, \ 'bytes': 15, 'cursor_bytes': 14}, wordcount()) " Test 4: some words, cursor at end, ve=all set ve=all %d _ call append(1, 'one two three') call cursor([2, 99, 0]) call assert_equal({'chars': 15, 'cursor_chars': 15, 'words': 3, 'cursor_words': 3, \ 'bytes': 15, 'cursor_bytes': 15}, wordcount()) set ve= " Test 5: several lines with words %d _ call append(1, ['one two three', 'one two three', 'one two three']) call cursor([4, 99, 0]) call assert_equal({'chars': 43, 'cursor_chars': 42, 'words': 9, 'cursor_words': 9, \ 'bytes': 43, 'cursor_bytes': 42}, wordcount()) " Test 6: one line with BOM set %d _ call append(1, 'one two three') set bomb w! Xtest call cursor([2, 99, 0]) call assert_equal({'chars': 15, 'cursor_chars': 14, 'words': 3, 'cursor_words': 3, \ 'bytes': 18, 'cursor_bytes': 14}, wordcount()) set nobomb w! call delete('Xtest') " Test 7: one line with multibyte words %d _ call append(1, ['Äne M¤ne Müh']) call cursor([2, 99, 0]) call assert_equal({'chars': 14, 'cursor_chars': 13, 'words': 3, 'cursor_words': 3, \ 'bytes': 17, 'cursor_bytes': 16}, wordcount()) " Test 8: several lines with multibyte words %d _ call append(1, ['Äne M¤ne Müh', 'und raus bist dü!']) call cursor([3, 99, 0]) call assert_equal({'chars': 32, 'cursor_chars': 31, 'words': 7, 'cursor_words': 7, \ 'bytes': 36, 'cursor_bytes': 35}, wordcount()) " Visual map to capture wordcount() in visual mode vnoremap <expr> <F2> execute("let g:visual_stat = wordcount()") " Test 9: visual mode, complete buffer let g:visual_stat = {} %d _ call append(1, ['Äne M¤ne Müh', 'und raus bist dü!']) " start visual mode and select the complete buffer 0 exe "normal V2j\<F2>y" call assert_equal({'chars': 32, 'words': 7, 'bytes': 36, 'visual_chars': 32, \ 'visual_words': 7, 'visual_bytes': 36}, g:visual_stat) " Test 10: visual mode (empty) %d _ call append(1, ['Äne M¤ne Müh', 'und raus bist dü!']) " start visual mode and select the complete buffer 0 exe "normal v$\<F2>y" call assert_equal({'chars': 32, 'words': 7, 'bytes': 36, 'visual_chars': 1, \ 'visual_words': 0, 'visual_bytes': 1}, g:visual_stat) " Test 11: visual mode, single line %d _ call append(1, ['Äne M¤ne Müh', 'und raus bist dü!']) " start visual mode and select the complete buffer 2 exe "normal 0v$\<F2>y" call assert_equal({'chars': 32, 'words': 7, 'bytes': 36, 'visual_chars': 13, \ 'visual_words': 3, 'visual_bytes': 16}, g:visual_stat) set selection& fileformat& fileformats& let &enc = save_enc enew! close endfunc " vim: shiftwidth=2 sts=2 expandtab