Mercurial > vim
changeset 32301:15352bf5c33e v9.0.1482
patch 9.0.1482: crash when textprop has a very large "padding" value
Commit: https://github.com/vim/vim/commit/2354b66ac52a8a9165e8bd0d642e19e757ba12c3
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Apr 23 21:42:25 2023 +0100
patch 9.0.1482: crash when textprop has a very large "padding" value
Problem: Crash when textprop has a very large "padding" value. (Yegappan
Lakshmanan)
Solution: Avoid the "after" count to go negative.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 23 Apr 2023 22:45:04 +0200 |
| parents | 174795e383bf |
| children | e4b257935898 |
| files | src/drawline.c src/testdir/dumps/Test_prop_above_padding_1.dump src/testdir/test_textprop.vim src/version.c |
| diffstat | 4 files changed, 36 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/drawline.c +++ b/src/drawline.c @@ -665,6 +665,12 @@ text_prop_position( { before = 0; after = wp->w_width - cells - win_col_off(wp) - padding; + if (after < 0) + { + // text "above" has too much padding to fit + padding += after; + after = 0; + } } else {
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_prop_above_padding_1.dump @@ -0,0 +1,8 @@ +> +0&#ffffff0@74 +|s|k|y| |i|s| |b|l|u|e| @63 +@74|… +|o|c|e|a|n| |i|s| |b|l|u|e| @61 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +| +0#0000000&@56|1|,|0|-|1| @8|A|l@1|
--- a/src/testdir/test_textprop.vim +++ b/src/testdir/test_textprop.vim @@ -3199,6 +3199,26 @@ func Test_props_with_text_above() call StopVimInTerminal(buf) endfunc +func Test_prop_with_text_above_padding() + CheckRunVimInTerminal + + let lines =<< trim END + vim9script + + setlocal tabstop=8 noexpandtab + setline(1, ['', 'sky is blue', 'ocean is blue']) + prop_type_add('DiagVirtualText', {highlight: 'Search', override: true}) + prop_add(3, 0, {text: "┌─ start", text_align: "above", + type: 'DiagVirtualText', + text_padding_left: 200}) + END + call writefile(lines, 'XscriptAbovePadding', 'D') + let buf = RunVimInTerminal('-S XscriptAbovePadding', #{rows: 8}) + call VerifyScreenDump(buf, 'Test_prop_above_padding_1', {}) + + call StopVimInTerminal(buf) +endfunc + func Test_prop_above_with_indent() new call setline(1, ['first line', ' second line', ' line below'])