summaryrefslogtreecommitdiffstats
path: root/debian/patches/CVE-2022-3235.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/CVE-2022-3235.patch')
-rw-r--r--debian/patches/CVE-2022-3235.patch12
1 files changed, 4 insertions, 8 deletions
diff --git a/debian/patches/CVE-2022-3235.patch b/debian/patches/CVE-2022-3235.patch
index fc3e20e..d18b7a1 100644
--- a/debian/patches/CVE-2022-3235.patch
+++ b/debian/patches/CVE-2022-3235.patch
@@ -14,8 +14,6 @@ Solution: Make sure pointer to b_p_iminsert is still valid.
Backport: rewrote b_im_ptr handling
-diff --git a/src/ex_getln.c b/src/ex_getln.c
-index 70436b31f05e..a4fb61145c96 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -858,6 +858,7 @@ getcmdline_int(
@@ -67,7 +65,7 @@ index 70436b31f05e..a4fb61145c96 100644
{
if (b_im_ptr == &curbuf->b_p_iminsert)
set_iminsert_global();
-@@ -2476,7 +2478,8 @@ getcmdline_int(
+@@ -2476,7 +2478,8 @@ returncmd:
State = save_State;
#ifdef HAVE_INPUT_METHOD
@@ -77,11 +75,9 @@ index 70436b31f05e..a4fb61145c96 100644
im_save_status(b_im_ptr);
im_set_active(FALSE);
#endif
-diff --git a/src/testdir/test_cmdwin.vim b/src/testdir/test_cmdwin.vim
-index d62673aba254..fe849bcc1686 100644
--- /dev/null
+++ b/src/testdir/test_cmdwin.vim
-@@ -0,0 +0,12 @@
+@@ -0,0 +1,12 @@
+" This was using a pointer to a freed buffer
+func Test_cmdwin_freed_buffer_ptr()
+ au BufEnter * next 0| file
@@ -96,7 +92,7 @@ index d62673aba254..fe849bcc1686 100644
+" vim: shiftwidth=2 sts=2 expandtab
--- a/src/testdir/Make_all.mak
+++ b/src/testdir/Make_all.mak
-@@ -89,6 +89,7 @@
+@@ -89,6 +89,7 @@ NEW_TESTS = \
test_clientserver \
test_close_count \
test_cmdline \
@@ -106,7 +102,7 @@ index d62673aba254..fe849bcc1686 100644
test_compiler \
--- a/src/version.c
+++ b/src/version.c
-@@ -2618,6 +2618,7 @@
+@@ -2618,6 +2618,7 @@ static char *(extra_patches[]) =
"8.2.3403",
"8.2.3409",
"8.2.3428",