diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 05:09:20 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 05:09:20 +0000 |
| commit | 711b5e29b9a1e65610a6ac243c55e058e27a03e5 (patch) | |
| tree | b43d074b53c71ba5558dd4613e44f7fa85715753 /debian/patches/CVE-2022-1619.patch | |
| parent | Releasing progress-linux version 2:8.1.0875-5+deb10u4progress5u1. (diff) | |
| download | vim-711b5e29b9a1e65610a6ac243c55e058e27a03e5.tar.xz vim-711b5e29b9a1e65610a6ac243c55e058e27a03e5.zip | |
Merging debian version 2:8.1.0875-5+deb10u5.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/CVE-2022-1619.patch')
| -rw-r--r-- | debian/patches/CVE-2022-1619.patch | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/debian/patches/CVE-2022-1619.patch b/debian/patches/CVE-2022-1619.patch index 121a1b7..1015395 100644 --- a/debian/patches/CVE-2022-1619.patch +++ b/debian/patches/CVE-2022-1619.patch @@ -13,11 +13,9 @@ Solution: Check already being at the start of the command line. src/version.c | 2 ++ 3 files changed, 12 insertions(+), 4 deletions(-) -diff --git a/src/ex_getln.c b/src/ex_getln.c -index a97024b35171..7020f5143a01 100644 --- a/src/ex_getln.c +++ b/src/ex_getln.c -@@ -1635,10 +1635,13 @@ +@@ -1635,10 +1635,13 @@ getcmdline_int( { while (p > ccline.cmdbuff && vim_isspace(p[-1])) --p; @@ -35,15 +33,12 @@ index a97024b35171..7020f5143a01 100644 } else --p; -diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim -index 474638fb00d6..5a849f77f755 100644 --- a/src/testdir/test_cmdline.vim +++ b/src/testdir/test_cmdline.vim -@@ -641,6 +641,19 @@ - let &lines = lines +@@ -642,5 +642,18 @@ func Test_cmdwin_split_often() let &columns = columns endfunc -+ + +func Test_cmdline_remove_char() + let encoding_save = &encoding + @@ -56,19 +51,17 @@ index 474638fb00d6..5a849f77f755 100644 + + let &encoding = encoding_save +endfunc - - ++ + set cpo& -diff --git a/src/version.c b/src/version.c -index 201d26f06eb9..05888c722e8e 100644 --- a/src/version.c +++ b/src/version.c -@@ -795,6 +795,8 @@ static char *(features[]) = - 805, +@@ -796,6 +796,8 @@ static int included_patches[] = /**/ 5024, -+/**/ -+ 4899, /**/ ++ 4899, ++/**/ 4428, /**/ + 4397, |