From 711b5e29b9a1e65610a6ac243c55e058e27a03e5 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 8 May 2024 07:09:20 +0200 Subject: Merging debian version 2:8.1.0875-5+deb10u5. Signed-off-by: Daniel Baumann --- debian/patches/CVE-2022-2000.patch | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'debian/patches/CVE-2022-2000.patch') diff --git a/debian/patches/CVE-2022-2000.patch b/debian/patches/CVE-2022-2000.patch index 7f1a1e6..e3fa6e2 100644 --- a/debian/patches/CVE-2022-2000.patch +++ b/debian/patches/CVE-2022-2000.patch @@ -12,11 +12,9 @@ Solution: Truncate the message. src/version.c | 2 ++ 3 files changed, 17 insertions(+), 2 deletions(-) -diff --git a/src/ex_docmd.c b/src/ex_docmd.c -index cfb40e8d5cfa..634a1bcef566 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c -@@ -3111,9 +3111,17 @@ parse_cmd_address(exarg_T *eap, char **errormsg, int silent) +@@ -3111,9 +3111,17 @@ checkforcmd( static void append_command(char_u *cmd) { @@ -36,13 +34,11 @@ index cfb40e8d5cfa..634a1bcef566 100644 STRCAT(IObuff, ": "); d = IObuff + STRLEN(IObuff); while (*s != NUL && d - IObuff + 5 < IOSIZE) -diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim -index 77965b3f65a3..2289c343e9f8 100644 --- a/src/testdir/test_cmdline.vim +++ b/src/testdir/test_cmdline.vim -@@ -657,3 +657,9 @@ - - +@@ -657,3 +657,9 @@ endfunc + + set cpo& + +func Test_long_error_message() @@ -50,16 +46,14 @@ index 77965b3f65a3..2289c343e9f8 100644 + silent! norm Q00000000000000     000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000                                                                                                                                                                                                                         +endfunc + -diff --git a/src/version.c b/src/version.c -index 542028606dde..dd585c81afe9 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 */ -+/**/ -+ 5063, /**/ ++ 5063, ++/**/ 5043, /**/ + 805, -- cgit v1.2.3