mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-17 00:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

vim: add patch number to CVE-2021-3778 patch

Browse Source 
(From OE-Core rev: 222be29051a3543ac63a0eb07019e90d44429b16)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2021-11-10 10:26:27 +00:00
committed by Richard Purdie
parent c44131cf61
commit 974df2f61c
1 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
meta/recipes-support/vim/files/CVE-2021-3778.patch
View File

@@ -1,4 +1,4 @@
From eb41373c8c88b0789e5cf04669d6116f9a199264 Mon Sep 17 00:00:00 2001
From 6d351cec5b97cb72b226d03bd727e453a235ed8d Mon Sep 17 00:00:00 2001
From: Minjae Kim <flowergom@gmail.com>
Date: Sun, 26 Sep 2021 23:48:00 +0000
Subject: [PATCH] patch 8.2.3409: reading beyond end of line with invalid utf-8
@@ -10,16 +10,18 @@ Solution: Check for NUL when advancing.
Upstream-Status: Accepted [https://github.com/vim/vim/commit/65b605665997fad54ef39a93199e305af2fe4d7f]
CVE: CVE-2021-3778
Signed-off-by: Minjae Kim <flowergom@gmail.com>
---
src/regexp_nfa.c | 3 ++-
src/testdir/test_regexp_utf8.vim | 7 +++++++
2 files changed, 9 insertions(+), 1 deletion(-)
src/version.c | 2 ++
3 files changed, 11 insertions(+), 1 deletion(-)
Index: git/src/regexp_nfa.c
===================================================================
--- git.orig/src/regexp_nfa.c
+++ git/src/regexp_nfa.c
@@ -5455,7 +5455,8 @@ find_match_text(colnr_T startcol, int re
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index fb512f961..ace83a1a3 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -5455,7 +5455,8 @@ find_match_text(colnr_T startcol, int regstart, char_u *match_text)
match = FALSE;
break;
}
@@ -29,10 +31,10 @@ Index: git/src/regexp_nfa.c
}
if (match
// check that no composing char follows
Index: git/src/testdir/test_regexp_utf8.vim
===================================================================
--- git.orig/src/testdir/test_regexp_utf8.vim
+++ git/src/testdir/test_regexp_utf8.vim
diff --git a/src/testdir/test_regexp_utf8.vim b/src/testdir/test_regexp_utf8.vim
index 19ff882be..e0665818b 100644
--- a/src/testdir/test_regexp_utf8.vim
+++ b/src/testdir/test_regexp_utf8.vim
@@ -215,3 +215,10 @@ func Test_optmatch_toolong()
set re=0
endfunc
@@ -44,3 +46,16 @@ Index: git/src/testdir/test_regexp_utf8.vim
+ bwipe!
+ call delete('Xinvalid')
+endfunc
diff --git a/src/version.c b/src/version.c
index 8912f6215..85bdfc601 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 3409,
/**/
3402,
/**/