diff options
author | Ross Burton <ross@burtonini.com> | 2021-11-10 10:26:27 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-12-02 16:53:07 +0000 |
commit | 695c0cd68074dbac3f686114e2faa800397c7113 (patch) | |
tree | 2d698c472be0e890adbdeda8f928e277f0cd353c /meta | |
parent | 8821203873074e4820f956ec646d89dea277fce1 (diff) | |
download | poky-695c0cd68074dbac3f686114e2faa800397c7113.tar.gz |
vim: add patch number to CVE-2021-3778 patch
(From OE-Core rev: dc7789ac5277752060c7f5aeede5c4d861951e39)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 222be29051a3543ac63a0eb07019e90d44429b16)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-support/vim/files/CVE-2021-3778.patch | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/meta/recipes-support/vim/files/CVE-2021-3778.patch b/meta/recipes-support/vim/files/CVE-2021-3778.patch index 9e1c4d29be..5fa60f5340 100644 --- a/meta/recipes-support/vim/files/CVE-2021-3778.patch +++ b/meta/recipes-support/vim/files/CVE-2021-3778.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From eb41373c8c88b0789e5cf04669d6116f9a199264 Mon Sep 17 00:00:00 2001 | 1 | From 6d351cec5b97cb72b226d03bd727e453a235ed8d Mon Sep 17 00:00:00 2001 |
2 | From: Minjae Kim <flowergom@gmail.com> | 2 | From: Minjae Kim <flowergom@gmail.com> |
3 | Date: Sun, 26 Sep 2021 23:48:00 +0000 | 3 | Date: Sun, 26 Sep 2021 23:48:00 +0000 |
4 | Subject: [PATCH] patch 8.2.3409: reading beyond end of line with invalid utf-8 | 4 | Subject: [PATCH] patch 8.2.3409: reading beyond end of line with invalid utf-8 |
@@ -10,13 +10,15 @@ Solution: Check for NUL when advancing. | |||
10 | Upstream-Status: Accepted [https://github.com/vim/vim/commit/65b605665997fad54ef39a93199e305af2fe4d7f] | 10 | Upstream-Status: Accepted [https://github.com/vim/vim/commit/65b605665997fad54ef39a93199e305af2fe4d7f] |
11 | CVE: CVE-2021-3778 | 11 | CVE: CVE-2021-3778 |
12 | Signed-off-by: Minjae Kim <flowergom@gmail.com> | 12 | Signed-off-by: Minjae Kim <flowergom@gmail.com> |
13 | |||
13 | --- | 14 | --- |
14 | src/regexp_nfa.c | 3 ++- | 15 | src/regexp_nfa.c | 3 ++- |
15 | src/testdir/test_regexp_utf8.vim | 7 +++++++ | 16 | src/testdir/test_regexp_utf8.vim | 7 +++++++ |
16 | 2 files changed, 9 insertions(+), 1 deletion(-) | 17 | src/version.c | 2 ++ |
18 | 3 files changed, 11 insertions(+), 1 deletion(-) | ||
17 | 19 | ||
18 | diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c | 20 | diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c |
19 | index fb512f961..4d337f1f1 100644 | 21 | index fb512f961..ace83a1a3 100644 |
20 | --- a/src/regexp_nfa.c | 22 | --- a/src/regexp_nfa.c |
21 | +++ b/src/regexp_nfa.c | 23 | +++ b/src/regexp_nfa.c |
22 | @@ -5455,7 +5455,8 @@ find_match_text(colnr_T startcol, int regstart, char_u *match_text) | 24 | @@ -5455,7 +5455,8 @@ find_match_text(colnr_T startcol, int regstart, char_u *match_text) |
@@ -44,6 +46,16 @@ index 19ff882be..e0665818b 100644 | |||
44 | + bwipe! | 46 | + bwipe! |
45 | + call delete('Xinvalid') | 47 | + call delete('Xinvalid') |
46 | +endfunc | 48 | +endfunc |
47 | -- | 49 | diff --git a/src/version.c b/src/version.c |
48 | 2.17.1 | 50 | index 8912f6215..85bdfc601 100644 |
49 | 51 | --- a/src/version.c | |
52 | +++ b/src/version.c | ||
53 | @@ -742,6 +742,8 @@ static char *(features[]) = | ||
54 | |||
55 | static int included_patches[] = | ||
56 | { /* Add new patch number below this line */ | ||
57 | +/**/ | ||
58 | + 3409, | ||
59 | /**/ | ||
60 | 3402, | ||
61 | /**/ | ||