summaryrefslogtreecommitdiffstats
path: root/debian/patches/CVE-2022-3256.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-08 05:09:20 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-08 05:09:20 +0000
commit711b5e29b9a1e65610a6ac243c55e058e27a03e5 (patch)
treeb43d074b53c71ba5558dd4613e44f7fa85715753 /debian/patches/CVE-2022-3256.patch
parentReleasing progress-linux version 2:8.1.0875-5+deb10u4progress5u1. (diff)
downloadvim-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 '')
-rw-r--r--debian/patches/CVE-2022-3256.patch8
1 files changed, 2 insertions, 6 deletions
diff --git a/debian/patches/CVE-2022-3256.patch b/debian/patches/CVE-2022-3256.patch
index ab1abab..9cbaf88 100644
--- a/debian/patches/CVE-2022-3256.patch
+++ b/debian/patches/CVE-2022-3256.patch
@@ -11,8 +11,6 @@ Solution: Copy the mark before editing another buffer.
src/version.c | 2 ++
3 files changed, 22 insertions(+), 5 deletions(-)
-diff --git a/src/mark.c b/src/mark.c
-index ade5a1087b7d..584db033d3ca 100644
--- a/src/mark.c
+++ b/src/mark.c
@@ -252,17 +252,19 @@ movemark(int count)
@@ -40,11 +38,9 @@ index ade5a1087b7d..584db033d3ca 100644
pos = (pos_T *)-1;
}
else
-diff --git a/src/testdir/test_marks.vim b/src/testdir/test_marks.vim
-index 12501a3aba07..20fb3041f244 100644
--- a/src/testdir/test_marks.vim
+++ b/src/testdir/test_marks.vim
-@@ -174,3 +174,16 @@ func Test_getmarklist()
+@@ -174,3 +174,16 @@ func Test_mark_error()
call assert_fails('mark xx', 'E488:')
call assert_fails('mark _', 'E191:')
endfunc
@@ -63,7 +59,7 @@ index 12501a3aba07..20fb3041f244 100644
+
--- a/src/version.c
+++ b/src/version.c
-@@ -2619,6 +2619,7 @@
+@@ -2619,6 +2619,7 @@ static char *(extra_patches[]) =
"8.2.3409",
"8.2.3428",
"9.0.0490",