diff options
| -rw-r--r-- | meta/recipes-support/vim/files/CVE-2021-3796.patch | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/meta/recipes-support/vim/files/CVE-2021-3796.patch b/meta/recipes-support/vim/files/CVE-2021-3796.patch deleted file mode 100644 index 666bd5c48b..0000000000 --- a/meta/recipes-support/vim/files/CVE-2021-3796.patch +++ /dev/null | |||
| @@ -1,50 +0,0 @@ | |||
| 1 | From 6d02e1429771c00046b48f26e53ca4123c3ce4e1 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Bram Moolenaar <Bram@vim.org> | ||
| 3 | Date: Fri, 24 Sep 2021 16:01:09 +0800 | ||
| 4 | Subject: [PATCH] patch 8.2.3428: using freed memory when replacing | ||
| 5 | |||
| 6 | Problem: Using freed memory when replacing. (Dhiraj Mishra) | ||
| 7 | Solution: Get the line pointer after calling ins_copychar(). | ||
| 8 | |||
| 9 | Upstream-Status: Backport [https://github.com/vim/vim/commit/35a9a00afcb20897d462a766793ff45534810dc3] | ||
| 10 | CVE: CVE-2021-3796 | ||
| 11 | |||
| 12 | Signed-off-by: Minjae Kim <flowergom@gmail.com> | ||
| 13 | --- | ||
| 14 | src/normal.c | 10 +++++++--- | ||
| 15 | 1 file changed, 7 insertions(+), 3 deletions(-) | ||
| 16 | |||
| 17 | diff --git a/src/normal.c b/src/normal.c | ||
| 18 | index c4963e621..305b514bc 100644 | ||
| 19 | --- a/src/normal.c | ||
| 20 | +++ b/src/normal.c | ||
| 21 | @@ -5009,19 +5009,23 @@ nv_replace(cmdarg_T *cap) | ||
| 22 | { | ||
| 23 | /* | ||
| 24 | * Get ptr again, because u_save and/or showmatch() will have | ||
| 25 | - * released the line. At the same time we let know that the | ||
| 26 | - * line will be changed. | ||
| 27 | + * released the line. This may also happen in ins_copychar(). | ||
| 28 | + * At the same time we let know that the line will be changed. | ||
| 29 | */ | ||
| 30 | - ptr = ml_get_buf(curbuf, curwin->w_cursor.lnum, TRUE); | ||
| 31 | if (cap->nchar == Ctrl_E || cap->nchar == Ctrl_Y) | ||
| 32 | { | ||
| 33 | int c = ins_copychar(curwin->w_cursor.lnum | ||
| 34 | + (cap->nchar == Ctrl_Y ? -1 : 1)); | ||
| 35 | + | ||
| 36 | + ptr = ml_get_buf(curbuf, curwin->w_cursor.lnum, TRUE); | ||
| 37 | if (c != NUL) | ||
| 38 | ptr[curwin->w_cursor.col] = c; | ||
| 39 | } | ||
| 40 | else | ||
| 41 | + { | ||
| 42 | + ptr = ml_get_buf(curbuf, curwin->w_cursor.lnum, TRUE); | ||
| 43 | ptr[curwin->w_cursor.col] = cap->nchar; | ||
| 44 | + } | ||
| 45 | if (p_sm && msg_silent == 0) | ||
| 46 | showmatch(cap->nchar); | ||
| 47 | ++curwin->w_cursor.col; | ||
| 48 | -- | ||
| 49 | 2.17.1 | ||
| 50 | |||
