diff options
Diffstat (limited to 'debian/patches/CVE-2022-1621.patch')
| -rw-r--r-- | debian/patches/CVE-2022-1621.patch | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/debian/patches/CVE-2022-1621.patch b/debian/patches/CVE-2022-1621.patch index 29f8532..62b4eec 100644 --- a/debian/patches/CVE-2022-1621.patch +++ b/debian/patches/CVE-2022-1621.patch @@ -26,11 +26,9 @@ Solution: Remove the test. src/version.c | 2 ++ 2 files changed, 2 insertions(+), 8 deletions(-) -diff --git a/src/mbyte.c b/src/mbyte.c -index 2b7f9991ae14..a01a05140207 100644 --- a/src/mbyte.c +++ b/src/mbyte.c -@@ -4047,7 +4047,7 @@ utf_find_illegal(void) +@@ -4047,7 +4047,7 @@ theend: convert_setup(&vimconv, NULL, NULL); } @@ -39,8 +37,6 @@ index 2b7f9991ae14..a01a05140207 100644 /* * Return TRUE if string "s" is a valid utf-8 string. * When "end" is NULL stop at the first NUL. -diff --git a/src/spellfile.c b/src/spellfile.c -index 22cf82da0872..f0d6d96a47f0 100644 --- a/src/spellfile.c +++ b/src/spellfile.c @@ -4361,6 +4361,10 @@ store_word( @@ -67,11 +63,9 @@ index 22cf82da0872..f0d6d96a47f0 100644 if (idx == 0) /* use internal wordlist */ { if (int_wordlist == NULL) -diff --git a/src/testdir/test_spell_utf8.vim b/src/testdir/test_spell_utf8.vim -index 79dc3e4a4a62..17fa23555818 100644 --- a/src/testdir/test_spell.vim +++ b/src/testdir/test_spell.vim -@@ -476,16 +476,6 @@ +@@ -476,16 +476,6 @@ func RunGoodBad(good, bad, expected_word bwipe! endfunc @@ -88,27 +82,25 @@ index 79dc3e4a4a62..17fa23555818 100644 let g:test_data_aff1 = [ \"SET ISO8859-1", \"TRY esianrtolcdugmphbyfvkwjkqxz-\xEB\xE9\xE8\xEA\xEF\xEE\xE4\xE0\xE2\xF6\xFC\xFB'ESIANRTOLCDUGMPHBYFVKWJKQXZ", -@@ -936,3 +926,8 @@ +@@ -936,3 +926,8 @@ let g:test_data_aff_sal = [ \"SAL Z S", \ ] - + +" Invalid bytes may cause trouble when creating the word list. +func Test_check_for_valid_word() + call assert_fails("spellgood! 0\xac", 'E1280:') +endfunc + -diff --git a/src/version.c b/src/version.c -index f949dd6d7ed0..c4f5655bf6c2 100644 --- a/src/version.c +++ b/src/version.c -@@ -795,6 +795,10 @@ static char *(features[]) = - 805, +@@ -796,6 +796,10 @@ static int included_patches[] = /**/ 5024, -+/**/ + /**/ + 4921, +/**/ + 4919, - /**/ ++/**/ 4899, /**/ + 4428, |