Mercurial > vim
view src/testdir/test_crash.vim @ 34686:83875247fbc0 v9.1.0224
patch 9.1.0224: cursor may move too many lines over "right" & "below" virt text
Commit: https://github.com/vim/vim/commit/515f734e687f28f7199b2a8042197624d9f3ec15
Author: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Date: Thu Mar 28 12:01:14 2024 +0100
patch 9.1.0224: cursor may move too many lines over "right" & "below" virt text
Problem: If a line has "right" & "below" virtual text properties,
where the "below" property may be stored first due to lack of
ordering between them, then the line height is calculated to
be 1 more and causes the cursor to far over the line.
Solution: Remove some unnecessary setting of a
`next_right_goes_below = TRUE` flag for "below" and "above"
text properties. (Dylan Thacker-Smith)
I modified a regression test I recently added to cover this case,
leveraging the fact that "after", "right" & "below" text properties are
being stored in the reverse of the order they are added in. The
previous version of this regression test was crafted to workaround this
issue so it can be addressed by this separate patch.
closes: #14317
Signed-off-by: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Thu, 28 Mar 2024 12:15:03 +0100 |
parents | a49ae967e9ed |
children | 1758bb7a9865 |
line wrap: on
line source
" Some tests, that used to crash Vim source check.vim source screendump.vim CheckScreendump func Test_crash1() CheckNotBSD CheckExecutable dash " Test 7 fails on Mac ... CheckNotMac " The following used to crash Vim let opts = #{cmd: 'sh'} let vim = GetVimProg() let buf = RunVimInTerminal('sh', opts) let file = 'crash/poc_huaf1' let cmn_args = "%s -u NONE -i NONE -n -e -s -S %s -c ':qa!'" let args = printf(cmn_args, vim, file) call term_sendkeys(buf, args .. \ ' && echo "crash 1: [OK]" > X_crash1_result.txt' .. "\<cr>") call TermWait(buf, 50) let file = 'crash/poc_huaf2' let args = printf(cmn_args, vim, file) call term_sendkeys(buf, args .. \ ' && echo "crash 2: [OK]" >> X_crash1_result.txt' .. "\<cr>") call TermWait(buf, 50) let file = 'crash/poc_huaf3' let args = printf(cmn_args, vim, file) call term_sendkeys(buf, args .. \ ' && echo "crash 3: [OK]" >> X_crash1_result.txt' .. "\<cr>") call TermWait(buf, 100) let file = 'crash/bt_quickfix_poc' let args = printf(cmn_args, vim, file) call term_sendkeys(buf, args .. \ ' && echo "crash 4: [OK]" >> X_crash1_result.txt' .. "\<cr>") " clean up call delete('Xerr') " This test takes a bit longer call TermWait(buf, 1000) let file = 'crash/poc_tagfunc.vim' let args = printf(cmn_args, vim, file) " using || because this poc causes vim to exit with exitstatus != 0 call term_sendkeys(buf, args .. \ ' || echo "crash 5: [OK]" >> X_crash1_result.txt' .. "\<cr>") call TermWait(buf, 100) let file = 'crash/bt_quickfix1_poc' let args = printf(cmn_args, vim, file) call term_sendkeys(buf, args .. \ ' && echo "crash 6: [OK]" >> X_crash1_result.txt' .. "\<cr>") " clean up call delete('X') call TermWait(buf, 3000) let file = 'crash/vim_regsub_both_poc' let args = printf(cmn_args, vim, file) call term_sendkeys(buf, args .. \ ' && echo "crash 7: [OK]" >> X_crash1_result.txt' .. "\<cr>") call TermWait(buf, 3000) let file = 'crash/vim_msg_trunc_poc' let args = printf(cmn_args, vim, file) call term_sendkeys(buf, args .. \ ' || echo "crash 8: [OK]" >> X_crash1_result.txt' .. "\<cr>") call TermWait(buf, 3000) let file = 'crash/crash_scrollbar' let args = printf(cmn_args, vim, file) call term_sendkeys(buf, args .. \ ' && echo "crash 9: [OK]" >> X_crash1_result.txt' .. "\<cr>") call TermWait(buf, 1000) let file = 'crash/editing_arg_idx_POC_1' let args = printf(cmn_args, vim, file) call term_sendkeys(buf, args .. \ ' || echo "crash 10: [OK]" >> X_crash1_result.txt' .. "\<cr>") call TermWait(buf, 1000) call delete('Xerr') call delete('@') " clean up exe buf .. "bw!" sp X_crash1_result.txt let expected = [ \ 'crash 1: [OK]', \ 'crash 2: [OK]', \ 'crash 3: [OK]', \ 'crash 4: [OK]', \ 'crash 5: [OK]', \ 'crash 6: [OK]', \ 'crash 7: [OK]', \ 'crash 8: [OK]', \ 'crash 9: [OK]', \ 'crash 10: [OK]', \ ] call assert_equal(expected, getline(1, '$')) bw! call delete('X_crash1_result.txt') endfunc func Test_crash1_2() CheckNotBSD CheckExecutable dash let g:test_is_flaky = 1 " The following used to crash Vim let opts = #{cmd: 'sh'} let vim = GetVimProg() let result = 'X_crash1_2_result.txt' let buf = RunVimInTerminal('sh', opts) let file = 'crash/poc1' let cmn_args = "%s -u NONE -i NONE -n -e -s -S %s -c ':qa!'" let args = printf(cmn_args, vim, file) call term_sendkeys(buf, args .. \ ' && echo "crash 1: [OK]" > '.. result .. "\<cr>") call TermWait(buf, 150) let file = 'crash/poc_win_enter_ext' let cmn_args = "%s -u NONE -i NONE -n -e -s -S %s -c ':qa!'" let args = printf(cmn_args, vim, file) call term_sendkeys(buf, args .. \ ' && echo "crash 2: [OK]" >> '.. result .. "\<cr>") call TermWait(buf, 350) let file = 'crash/poc_suggest_trie_walk' let cmn_args = "%s -u NONE -i NONE -n -e -s -S %s -c ':qa!'" let args = printf(cmn_args, vim, file) call term_sendkeys(buf, args .. \ ' && echo "crash 3: [OK]" >> '.. result .. "\<cr>") call TermWait(buf, 150) let file = 'crash/poc_did_set_langmap' let cmn_args = "%s -u NONE -i NONE -n -X -m -n -e -s -S %s -c ':qa!'" let args = printf(cmn_args, vim, file) call term_sendkeys(buf, args .. \ ' ; echo "crash 4: [OK]" >> '.. result .. "\<cr>") call TermWait(buf, 150) " clean up exe buf .. "bw!" exe "sp " .. result let expected = [ \ 'crash 1: [OK]', \ 'crash 2: [OK]', \ 'crash 3: [OK]', \ 'crash 4: [OK]', \ ] call assert_equal(expected, getline(1, '$')) bw! call delete(result) endfunc " This test just runs various scripts, that caused issues before. " We are not really asserting anything here, it's just important " that ASAN does not detect any issues. func Test_crash1_3() let vim = GetVimProg() let buf = RunVimInTerminal('sh', #{cmd: 'sh'}) let file = 'crash/poc_ex_substitute' let cmn_args = "%s -u NONE -i NONE -n -e -s -S %s -c ':qa!'\<cr>" let args = printf(cmn_args, vim, file) call term_sendkeys(buf, args) call TermWait(buf, 150) let file = 'crash/poc_uaf_exec_instructions' let cmn_args = "%s -u NONE -i NONE -n -e -s -S %s -c ':qa!'\<cr>" let args = printf(cmn_args, vim, file) call term_sendkeys(buf, args) call TermWait(buf, 150) let file = 'crash/poc_uaf_check_argument_types' let cmn_args = "%s -u NONE -i NONE -n -e -s -S %s -c ':qa!'\<cr>" let args = printf(cmn_args, vim, file) call term_sendkeys(buf, args) call TermWait(buf, 150) " clean up exe buf .. "bw!" bw! endfunc func Test_crash2() " The following used to crash Vim let opts = #{wait_for_ruler: 0, rows: 20} let args = ' -u NONE -i NONE -n -e -s -S ' let buf = RunVimInTerminal(args .. ' crash/vim_regsub_both', opts) call VerifyScreenDump(buf, 'Test_crash_01', {}) exe buf .. "bw!" endfunc " vim: shiftwidth=2 sts=2 expandtab