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-0392.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-0392.patch')
| -rw-r--r-- | debian/patches/CVE-2022-0392.patch | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/debian/patches/CVE-2022-0392.patch b/debian/patches/CVE-2022-0392.patch index e410044..fb8d96a 100644 --- a/debian/patches/CVE-2022-0392.patch +++ b/debian/patches/CVE-2022-0392.patch @@ -45,11 +45,9 @@ Solution: When :normal runs out of characters in bracketed paste mode break Backport: drop included_patches 135 due to version bump -diff --git a/src/edit.c b/src/edit.c -index ee3caf0dad50..2b5301100ddb 100644 --- a/src/edit.c +++ b/src/edit.c -@@ -9183,7 +9183,7 @@ bracketed_paste(paste_mode_T mode, int drop, garray_T *gap) +@@ -9183,7 +9183,7 @@ bracketed_paste(paste_mode_T mode, int d int save_paste = p_paste; /* If the end code is too long we can't detect it, read everything. */ @@ -58,7 +56,7 @@ index ee3caf0dad50..2b5301100ddb 100644 end = NULL; ++no_mapping; allow_keys = 0; -@@ -9201,9 +9201,9 @@ bracketed_paste(paste_mode_T mode, int drop, garray_T *gap) +@@ -9201,9 +9201,9 @@ bracketed_paste(paste_mode_T mode, int d { c = vgetc(); } while (c == K_IGNORE || c == K_VER_SCROLLBAR || c == K_HOR_SCROLLBAR); @@ -70,7 +68,7 @@ index ee3caf0dad50..2b5301100ddb 100644 break; if (has_mbyte) -@@ -9226,7 +9226,8 @@ bracketed_paste(paste_mode_T mode, int drop, garray_T *gap) +@@ -9226,7 +9226,8 @@ bracketed_paste(paste_mode_T mode, int d break; case PASTE_EX: @@ -80,11 +78,9 @@ index ee3caf0dad50..2b5301100ddb 100644 { mch_memmove((char *)gap->ga_data + gap->ga_len, buf, (size_t)idx); -diff --git a/src/testdir/test_paste.vim b/src/testdir/test_paste.vim -index c94fe7c357ed..5b8d8a0e3e2d 100644 --- a/src/testdir/test_paste.vim +++ b/src/testdir/test_paste.vim -@@ -84,6 +84,16 @@ +@@ -84,6 +84,16 @@ func Test_paste_cmdline() call assert_equal("\"afoo\<CR>barb", getreg(':')) endfunc @@ -101,11 +97,9 @@ index c94fe7c357ed..5b8d8a0e3e2d 100644 func Test_paste_visual_mode() new call setline(1, 'here are some words') -diff --git a/src/testdir/test_search.vim b/src/testdir/test_search.vim -index 60152f602..89ca6e131 100644 --- a/src/testdir/test_search.vim +++ b/src/testdir/test_search.vim -@@ -1187,3 +1187,9 @@ +@@ -1187,3 +1187,9 @@ func Test_search_Ctrl_L_combining() call assert_equal(bufcontent[1], @/) call Incsearch_cleanup() endfunc @@ -115,16 +109,14 @@ index 60152f602..89ca6e131 100644 + set t_PE= + exe "norm /\x80PS" +endfunc -diff --git a/src/version.c b/src/version.c -index 6685b554f537..9dcf34928f8d 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, -+/**/ -+ 4218, /**/ ++ 4218, ++/**/ 4214, /**/ + 4152, |