diff --git a/backport-patch-9.1.0730-crash-with-cursor-screenline-and-narrow-window.patch b/backport-patch-9.1.0730-crash-with-cursor-screenline-and-narrow-window.patch new file mode 100644 index 0000000000000000000000000000000000000000..0e2089deb21f2bcd6ccba15c9e6d06017636ad69 --- /dev/null +++ b/backport-patch-9.1.0730-crash-with-cursor-screenline-and-narrow-window.patch @@ -0,0 +1,56 @@ +From 59149f02692804267e7cc0665d0334f6ff4675be Mon Sep 17 00:00:00 2001 +From: zeertzjq +Date: Sat, 14 Sep 2024 10:40:29 +0200 +Subject: [PATCH] patch 9.1.0730: Crash with cursor-screenline and narrow + window + +Problem: Crash with cursor-screenline and narrow window + (elig0n) +Solution: Don't set right_col when width2 is 0 (zeertzjq). + +fixes: #15677 +closes: #15678 + +Signed-off-by: zeertzjq +Signed-off-by: Christian Brabandt +--- + src/drawline.c | 2 +- + src/testdir/test_cursorline.vim | 11 +++++++++++ + 2 files changed, 12 insertions(+), 1 deletion(-) + +diff --git a/src/drawline.c b/src/drawline.c +index b627192a4ee0f..fd5d56b43e508 100644 +--- a/src/drawline.c ++++ b/src/drawline.c +@@ -62,7 +62,7 @@ margin_columns_win(win_T *wp, int *left_col, int *right_col) + *left_col = 0; + *right_col = width1; + +- if (wp->w_virtcol >= (colnr_T)width1) ++ if (wp->w_virtcol >= (colnr_T)width1 && width2 > 0) + *right_col = width1 + ((wp->w_virtcol - width1) / width2 + 1) * width2; + if (wp->w_virtcol >= (colnr_T)width1 && width2 > 0) + *left_col = (wp->w_virtcol - width1) / width2 * width2 + width1; +diff --git a/src/testdir/test_cursorline.vim b/src/testdir/test_cursorline.vim +index bdde670d207a5..d258111ae4de1 100644 +--- a/src/testdir/test_cursorline.vim ++++ b/src/testdir/test_cursorline.vim +@@ -309,6 +309,17 @@ func Test_cursorline_screenline_update() + call StopVimInTerminal(buf) + endfunc + ++func Test_cursorline_screenline_zero_width() ++ CheckOption foldcolumn ++ ++ set cursorline culopt=screenline winminwidth=1 foldcolumn=1 ++ " This used to crash Vim ++ 1vnew | redraw ++ ++ bwipe! ++ set cursorline& culopt& winminwidth& foldcolumn& ++endfunc ++ + func Test_cursorline_cursorbind_horizontal_scroll() + CheckScreendump + + diff --git a/vim.spec b/vim.spec index 88cb685268c33ae4e03fe3d024f77c670fba6be1..03879000dd5089b4b285ee018a0233b099f4e7ff 100644 --- a/vim.spec +++ b/vim.spec @@ -14,7 +14,7 @@ Name: vim Epoch: 2 Version: %{baseversion}.%{patchlevel} -Release: 13 +Release: 14 Summary: Vim is a highly configurable text editor for efficiently creating and changing any kind of text. License: Vim and MIT URL: http://www.vim.org @@ -51,6 +51,7 @@ Patch6016: backport-CVE-2024-41957.patch Patch6017: backport-CVE-2024-43374.patch Patch6018: backport-CVE-2024-43802.patch Patch6019: backport-patch-9.1.0722-crash-with-large-id-in-text_prop-interface.patch +Patch6020: backport-patch-9.1.0730-crash-with-cursor-screenline-and-narrow-window.patch Patch9000: bugfix-rm-modify-info-version.patch Patch9001: fix-CVE-2024-47814.patch @@ -459,6 +460,12 @@ LC_ALL=en_US.UTF-8 make -j1 test || echo "Warning: Please check tests." %{_mandir}/man1/evim.* %changelog +* Tue Nov 12 2024 wangjiang - 2:9.0.2092-14 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix coredump when use vnew command + * Thu Oct 17 2024 wangjiang - 2:9.0.2092-13 - Type:bugfix - ID:NA