summaryrefslogtreecommitdiffstats
path: root/debian/patches/CVE-2022-0359.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/CVE-2022-0359.patch')
-rw-r--r--debian/patches/CVE-2022-0359.patch14
1 files changed, 4 insertions, 10 deletions
diff --git a/debian/patches/CVE-2022-0359.patch b/debian/patches/CVE-2022-0359.patch
index e2b8ff3..6ca8edf 100644
--- a/debian/patches/CVE-2022-0359.patch
+++ b/debian/patches/CVE-2022-0359.patch
@@ -9,8 +9,6 @@ Origin: https://github.com/vim/vim/commit/85b6747abc15a7a81086db31289cf1b8b17e6c
src/version.c | 2 ++
3 files changed, 12 insertions(+), 1 deletion(-)
-diff --git a/src/ex_getln.c b/src/ex_getln.c
-index cba082a..328450c 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -898,7 +898,7 @@ getcmdline_int(
@@ -22,8 +20,6 @@ index cba082a..328450c 100644
if (ccline.cmdbuff == NULL)
goto theend; // out of memory
ccline.cmdlen = ccline.cmdpos = 0;
-diff --git a/src/testdir/test_ex_equal.vim b/src/testdir/test_ex_equal.vim
-index 03cfc46..fa00072 100644
--- a/src/testdir/test_ex_equal.vim
+++ b/src/testdir/test_ex_equal.vim
@@ -43,3 +43,12 @@ func Test_open_command_flush_line()
@@ -39,16 +35,14 @@ index 03cfc46..fa00072 100644
+ set ts=8 noai
+ bwipe!
+endfunc
-diff --git a/src/version.c b/src/version.c
-index 0a29ebb..586e9ca 100644
--- a/src/version.c
+++ b/src/version.c
-@@ -791,6 +791,8 @@ static char *(features[]) =
-
+@@ -792,6 +792,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
-+/**/
-+ 4214,
/**/
++ 4214,
++/**/
4120,
/**/
+ 1401,