mirror of
https://git.yoctoproject.org/poky
synced 2026-04-17 00:32:13 +02:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
8821203873
commit
695c0cd680
@@ -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,13 +10,15 @@ 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(-)
|
||||
|
||||
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
|
||||
index fb512f961..4d337f1f1 100644
|
||||
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)
|
||||
@@ -44,6 +46,16 @@ index 19ff882be..e0665818b 100644
|
||||
+ bwipe!
|
||||
+ call delete('Xinvalid')
|
||||
+endfunc
|
||||
--
|
||||
2.17.1
|
||||
|
||||
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,
|
||||
/**/
|
||||
|
||||
Reference in New Issue
Block a user