summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/vim/files/CVE-2021-3778.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support/vim/files/CVE-2021-3778.patch')
-rw-r--r--meta/recipes-support/vim/files/CVE-2021-3778.patch34
1 files changed, 0 insertions, 34 deletions
diff --git a/meta/recipes-support/vim/files/CVE-2021-3778.patch b/meta/recipes-support/vim/files/CVE-2021-3778.patch
deleted file mode 100644
index 04ac413e56..0000000000
--- a/meta/recipes-support/vim/files/CVE-2021-3778.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From 9ba62f1042513fcadcc4e8fdcee171db66ef1d69 Mon Sep 17 00:00:00 2001
2From: Bram Moolenaar <Bram@vim.org>
3Date: Fri, 24 Sep 2021 15:15:24 +0800
4Subject: [PATCH] patch 8.2.3409: reading beyond end of line with invalid utf-8
5 character
6
7Problem: Reading beyond end of line with invalid utf-8 character.
8Solution: Check for NUL when advancing.
9
10Upstream-Status: Backport [https://github.com/vim/vim/commit/65b605665997fad54ef39a93199e305af2fe4d7f]
11CVE: CVE-2021-3778
12
13Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
14---
15 src/regexp_nfa.c | 3 ++-
16 1 file changed, 2 insertions(+), 1 deletion(-)
17
18diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
19index fb512f961..2806408de 100644
20--- a/src/regexp_nfa.c
21+++ b/src/regexp_nfa.c
22@@ -5455,7 +5455,8 @@ find_match_text(colnr_T startcol, int regstart, char_u *match_text)
23 match = FALSE;
24 break;
25 }
26- len2 += MB_CHAR2LEN(c2);
27+ len2 += enc_utf8 ? utf_ptr2len(rex.line + col + len2)
28+ : MB_CHAR2LEN(c2);
29 }
30 if (match
31 // check that no composing char follows
32--
332.17.1
34