Mercurial > vim
view src/testdir/test_jumplist.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 | 1f3bcb7f3bd0 |
children | 814fcbca4d8d |
line wrap: on
line source
" Tests for the jumplist functionality " Tests for the getjumplist() function func Test_getjumplist() %bwipe clearjumps call assert_equal([[], 0], getjumplist()) call assert_equal([[], 0], getjumplist(1)) call assert_equal([[], 0], getjumplist(1, 1)) call assert_equal([], getjumplist(100)) call assert_equal([], getjumplist(1, 100)) let lines = [] for i in range(1, 100) call add(lines, "Line " . i) endfor call writefile(lines, "Xtest", 'D') " Jump around and create a jump list edit Xtest let bnr = bufnr('%') normal 50% normal G normal gg let expected = [[ \ {'lnum': 1, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 50, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 100, 'bufnr': bnr, 'col': 0, 'coladd': 0}], 3] call assert_equal(expected, getjumplist()) " jumplist doesn't change in between calls call assert_equal(expected, getjumplist()) " Traverse the jump list and verify the results 5 exe "normal \<C-O>" call assert_equal(2, 1->getjumplist()[1]) exe "normal 2\<C-O>" call assert_equal(0, getjumplist(1, 1)[1]) exe "normal 3\<C-I>" call assert_equal(3, getjumplist()[1]) exe "normal \<C-O>" normal 20% let expected = [[ \ {'lnum': 1, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 50, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 5, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 100, 'bufnr': bnr, 'col': 0, 'coladd': 0}], 4] call assert_equal(expected, getjumplist()) " jumplist doesn't change in between calls call assert_equal(expected, getjumplist()) let l = getjumplist() call test_garbagecollect_now() call assert_equal(4, l[1]) clearjumps call test_garbagecollect_now() call assert_equal(4, l[1]) endfunc func Test_jumplist_invalid() new clearjumps " put some randome text put ='a' let prev = bufnr('%') setl nomodified bufhidden=wipe e XXJumpListBuffer let bnr = bufnr('%') " 1) empty jumplist let expected = [[ \ {'lnum': 2, 'bufnr': prev, 'col': 0, 'coladd': 0}], 1] call assert_equal(expected, getjumplist()) let jumps = execute(':jumps') call assert_equal('>', jumps[-1:]) " now jump back exe ":norm! \<c-o>" let expected = [[ \ {'lnum': 2, 'bufnr': prev, 'col': 0, 'coladd': 0}, \ {'lnum': 1, 'bufnr': bnr, 'col': 0, 'coladd': 0}], 0] call assert_equal(expected, getjumplist()) let jumps = execute(':jumps') call assert_match('> 0 2 0 -invalid-', jumps) endfunc " Test for '' mark in an empty buffer func Test_empty_buffer() new insert a b c d . call assert_equal(1, line("''")) bwipe! endfunc " Test for 'jumpoptions' func Test_jumpoptions() new call setline(1, range(1, 200)) clearjumps set jumpoptions=stack " Jump around to add some locations to the jump list. normal 10G normal 20G normal 30G normal 40G normal 50G let bnr = bufnr() " discards the tail when navigating from the middle exe "normal \<C-O>\<C-O>" call assert_equal([ \ [{'lnum': 1, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 10, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 20, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 30, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 40, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 50, 'bufnr': bnr, 'col': 0, 'coladd': 0} \ ], 3], getjumplist()) " new jump location is added immediately after the last one normal 90G call assert_equal([ \ [{'lnum': 1, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 10, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 20, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 30, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ ], 4], getjumplist()) " does not add the same location twice adjacently normal 60G normal 60G call assert_equal([ \ [{'lnum': 1, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 10, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 20, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 30, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 90, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 60, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ ], 6], getjumplist()) " does add the same location twice non adjacently normal 10G normal 20G call assert_equal([ \ [{'lnum': 1, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 10, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 20, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 30, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 90, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 60, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 10, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ ], 7], getjumplist()) set jumpoptions& %bw! endfunc " vim: shiftwidth=2 sts=2 expandtab