summaryrefslogtreecommitdiffstats
path: root/debian/patches/CVE-2022-2129.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/CVE-2022-2129.patch')
-rw-r--r--debian/patches/CVE-2022-2129.patch16
1 files changed, 5 insertions, 11 deletions
diff --git a/debian/patches/CVE-2022-2129.patch b/debian/patches/CVE-2022-2129.patch
index 70bdd57..96e8d05 100644
--- a/debian/patches/CVE-2022-2129.patch
+++ b/debian/patches/CVE-2022-2129.patch
@@ -11,8 +11,6 @@ Solution: Disallow switching buffers in a substitute expression.
src/version.c | 2 ++
3 files changed, 19 insertions(+), 3 deletions(-)
-diff --git a/src/ex_docmd.c b/src/ex_docmd.c
-index fed9330b52e9..1185cd1550a6 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -8778,9 +8778,10 @@ do_exedit(
@@ -29,11 +27,9 @@ index fed9330b52e9..1185cd1550a6 100644
return;
n = readonlymode;
-diff --git a/src/testdir/test_substitute.vim b/src/testdir/test_substitute.vim
-index 46ea95513192..c056fa965692 100644
--- a/src/testdir/test_substitute.vim
+++ b/src/testdir/test_substitute.vim
-@@ -552,3 +552,16 @@
+@@ -552,3 +552,16 @@ func Test_sub_undo_change()
delfunc Repl
endfunc
@@ -50,16 +46,14 @@ index 46ea95513192..c056fa965692 100644
+ bwipe!
+endfunc
+
-diff --git a/src/version.c b/src/version.c
-index 82ac4eaf2dd9..2f397ae315f7 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 */
-+/**/
-+ 5126,
/**/
++ 5126,
++/**/
5063,
/**/
+ 5043,