diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 05:09:06 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 05:09:06 +0000 |
| commit | fe9135eaa14adace367ce3e0de55c4b53e5223c8 (patch) | |
| tree | cf0f56b778db5c718f20f8d2ab7058b159b8437c /debian/patches/CVE-2022-0629.patch | |
| parent | Adding debian version 2:8.1.0875-5+deb10u4. (diff) | |
| download | vim-debian/2%8.1.0875-5+deb10u5.tar.xz vim-debian/2%8.1.0875-5+deb10u5.zip | |
Adding debian version 2:8.1.0875-5+deb10u5.debian/2%8.1.0875-5+deb10u5
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/CVE-2022-0629.patch')
| -rw-r--r-- | debian/patches/CVE-2022-0629.patch | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/debian/patches/CVE-2022-0629.patch b/debian/patches/CVE-2022-0629.patch index b3348ef..7c32714 100644 --- a/debian/patches/CVE-2022-0629.patch +++ b/debian/patches/CVE-2022-0629.patch @@ -12,8 +12,6 @@ Solution: Use mb_cptr2char_adv() instead of mb_ptr2char_adv(). src/version.c | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) -diff --git a/src/testdir/test_assert.vim b/src/testdir/test_assert.vim -index 8987f3f8dfcd..27b2d73fbfc8 100644 --- a/src/testdir/test_assert.vim +++ b/src/testdir/test_assert.vim @@ -35,6 +35,14 @@ func Test_assert_equal() @@ -31,11 +29,9 @@ index 8987f3f8dfcd..27b2d73fbfc8 100644 endfunc func Test_assert_equalfile() -diff --git a/src/testing.c b/src/testing.c -index 448c01c1e964..48ba14d2cafd 100644 --- a/src/eval.c +++ b/src/eval.c -@@ -101,7 +101,7 @@ ga_concat_shorten_esc(garray_T *gap, char_u *str) +@@ -9558,7 +9558,7 @@ ga_concat_shorten_esc(garray_T *gap, cha { same_len = 1; s = p; @@ -44,16 +40,14 @@ index 448c01c1e964..48ba14d2cafd 100644 clen = s - p; while (*s != NUL && c == mb_ptr2char(s)) { -diff --git a/src/version.c b/src/version.c -index fb1b8476e1a6..b4983661cadc 100644 --- a/src/version.c +++ b/src/version.c -@@ -795,6 +795,8 @@ static char *(features[]) = - 805, +@@ -796,6 +796,8 @@ static int included_patches[] = /**/ 5024, -+/**/ -+ 4397, /**/ ++ 4397, ++/**/ 4218, /**/ + 4214, |