From c7f791ec9716545f3a58722dd81a75e0c8989bad Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 12 Nov 2024 10:49:30 +0000 Subject: [PATCH] import UBI vim-8.2.2637-21.el9 --- .gitignore | 3 + .vim.metadata | 3 + ...nvalid-memory-access-when-scrolling-.patch | 82 ++++++++++++++++++ SOURCES/gvim16.png | Bin 226 -> 0 bytes SOURCES/gvim32.png | Bin 347 -> 0 bytes SOURCES/gvim48.png | Bin 474 -> 0 bytes SPECS/vim.spec | 8 +- 7 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 SOURCES/0001-patch-8.2.3564-invalid-memory-access-when-scrolling-.patch delete mode 100644 SOURCES/gvim16.png delete mode 100644 SOURCES/gvim32.png delete mode 100644 SOURCES/gvim48.png diff --git a/.gitignore b/.gitignore index ba71b993..ddc6433d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ +SOURCES/gvim16.png +SOURCES/gvim32.png +SOURCES/gvim48.png SOURCES/gvim64.png SOURCES/vim-8.2-2637.tar.bz2 diff --git a/.vim.metadata b/.vim.metadata index c47e60ca..f075a0bc 100644 --- a/.vim.metadata +++ b/.vim.metadata @@ -1,2 +1,5 @@ +a7c81ffd40611b19c125c505699d8a6401f6e022 SOURCES/gvim16.png +2356345378a9f1ba3c9e9e6508b695611e8f2cfa SOURCES/gvim32.png +37ad682f67539da7f4d4b7316383115dfe43222d SOURCES/gvim48.png c32bd520a1498b71ee9bbcddc7ad05df1565d085 SOURCES/gvim64.png 8405efdee1d83465651f90edc1173ff69f390aea SOURCES/vim-8.2-2637.tar.bz2 diff --git a/SOURCES/0001-patch-8.2.3564-invalid-memory-access-when-scrolling-.patch b/SOURCES/0001-patch-8.2.3564-invalid-memory-access-when-scrolling-.patch new file mode 100644 index 00000000..5bd88ad9 --- /dev/null +++ b/SOURCES/0001-patch-8.2.3564-invalid-memory-access-when-scrolling-.patch @@ -0,0 +1,82 @@ +From 777e7c21b7627be80961848ac560cb0a9978ff43 Mon Sep 17 00:00:00 2001 +From: Bram Moolenaar +Date: Mon, 25 Oct 2021 17:07:04 +0100 +Subject: [PATCH] patch 8.2.3564: invalid memory access when scrolling without + valid screen + +Problem: Invalid memory access when scrolling without a valid screen. +Solution: Do not set VALID_BOTLINE in w_valid. +--- + src/move.c | 1 - + src/testdir/test_normal.vim | 22 +++++++++++++++++++--- + src/version.c | 2 ++ + 3 files changed, 21 insertions(+), 4 deletions(-) + +diff --git a/src/move.c b/src/move.c +index 8fe00bb67..64b12963c 100644 +--- a/src/move.c ++++ b/src/move.c +@@ -199,7 +199,6 @@ update_topline(void) + check_cursor_lnum(); + curwin->w_topline = curwin->w_cursor.lnum; + curwin->w_botline = curwin->w_topline; +- curwin->w_valid |= VALID_BOTLINE|VALID_BOTLINE_AP; + curwin->w_scbind_pos = 1; + return; + } +diff --git a/src/testdir/test_normal.vim b/src/testdir/test_normal.vim +index f8dbf8aed..f994f970a 100644 +--- a/src/testdir/test_normal.vim ++++ b/src/testdir/test_normal.vim +@@ -34,14 +34,14 @@ func CountSpaces(type, ...) + else + silent exe "normal! `[v`]y" + endif +- let g:a=strlen(substitute(@@, '[^ ]', '', 'g')) ++ let g:a = strlen(substitute(@@, '[^ ]', '', 'g')) + let &selection = sel_save + let @@ = reg_save + endfunc + + func OpfuncDummy(type, ...) + " for testing operatorfunc +- let g:opt=&linebreak ++ let g:opt = &linebreak + + if a:0 " Invoked from Visual mode, use gv command. + silent exe "normal! gvy" +@@ -52,7 +52,7 @@ func OpfuncDummy(type, ...) + endif + " Create a new dummy window + new +- let g:bufnr=bufnr('%') ++ let g:bufnr = bufnr('%') + endfunc + + func Test_normal00_optrans() +@@ -987,6 +987,22 @@ func Test_vert_scroll_cmds() + close! + endfunc + ++func Test_scroll_in_ex_mode() ++ " This was using invalid memory because w_botline was invalid. ++ let lines =<< trim END ++ diffsplit ++ norm os00( ++ call writefile(['done'], 'Xdone') ++ qa! ++ END ++ call writefile(lines, 'Xscript') ++ call assert_equal(1, RunVim([], [], '--clean -X -Z -e -s -S Xscript')) ++ call assert_equal(['done'], readfile('Xdone')) ++ ++ call delete('Xscript') ++ call delete('Xdone') ++endfunc ++ + " Test for the 'sidescroll' option + func Test_sidescroll_opt() + new +-- +2.45.2 + diff --git a/SOURCES/gvim16.png b/SOURCES/gvim16.png deleted file mode 100644 index fb45d22a0560d23c20b65ea1922099a8ae56683e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFNHZ`PcHfZ)Qj8@*e!&b5&u*jvIT@ZVjv*CuR8Mc@ zWj5qtc3Ad_O|n7D#PNZdv4p{<#;aOPpQ7wH&A-~H(0FEjI#ces{NS%G|s0G|-o zy?ggE{AW0D;6Ot|0|P_D|Ns9PfHVVxVfP(*AjMb`R->=d;b*aaz$6Grc8>A8&|3~cJ#=EAl zQh(N!+v&YdbC*qLy3#Ra-Yi#6Hn&AOE3X^J-{fi4xT~UH=f*PWPJcm@$?k%Nzb~7b zg9{Q4rOcHwSXdJh$veYA#cPMejBNcyYog@ehXx#V6cxFmY%c!g+SWR~-49X?lL`;A z2OYd(b#&rnojkYs7sG50960epnMK;CuZRE1VF|CkpIZIQnO^aJ1_e&rQbU`3`j!f^ prZt4{?=dvEVyCl>^WWmXeD+q;v;HP33WR||z|+;wWt~$(69DQDh-3f& diff --git a/SOURCES/gvim48.png b/SOURCES/gvim48.png deleted file mode 100644 index 4bac67e62ae3e2a1079538980281ae5403ed5115..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 474 zcmV<00VV#4P)q`j~yD^i1yhu;pDSnN4t)IMz?&o1sEC(ug`fYUtwt@M< z!Ht0*20$gEw83~QdPt{TC0`v8%=BWFHVz!zo6rH;A_*LH0tcPIKrb-R3k?*ZfchO- zIPzRz%IhMSJePgW;8SZ&G`I{x5ezAN?zL({Qs7cR6OytI1u!8^UuJM+f_aWYYy*KC z7bI2(SqI$-sEh@;zywq(@Rq<+@?J3@yLmJ~6&P4_=!6PXIOdoeo#_e|?VY!j{FI%cOgu=}Y5*cEJR z$)Z7~5-Teq#9QI1+{(wrEIo-mfH53nSRrM14{SqiYabxxKex - 2:8.2.2637-21 +- RHEL-40602 CVE-2021-3903 vim: heap-based buffer overflow vulnerability + * Thu Feb 09 2023 Zdenek Dohnal - 2:8.2.2637-20 - CVE-2022-47024 vim: no check if the return value of XChangeGC() is NULL