diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-09-11 21:14:20 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-09-11 21:14:20 +0200 |
| commit | 35a9a00afcb20897d462a766793ff45534810dc3 (patch) | |
| tree | 2706b760e766121610ba642b5d45496861a7a898 | |
| parent | b3bf33a7b227df871834e816c4ce4b2706b56bea (diff) | |
patch 8.2.3428: using freed memory when replacingv8.2.3428
Problem: Using freed memory when replacing. (Dhiraj Mishra)
Solution: Get the line pointer after calling ins_copychar().
| -rw-r--r-- | src/normal.c | 10 | ||||
| -rw-r--r-- | src/testdir/test_edit.vim | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 21 insertions, 3 deletions
diff --git a/src/normal.c b/src/normal.c index 0e1e11801c..6620af9245 100644 --- a/src/normal.c +++ b/src/normal.c @@ -5099,19 +5099,23 @@ nv_replace(cmdarg_T *cap) { /* * Get ptr again, because u_save and/or showmatch() will have - * released the line. At the same time we let know that the - * line will be changed. + * released the line. This may also happen in ins_copychar(). + * At the same time we let know that the line will be changed. */ - ptr = ml_get_buf(curbuf, curwin->w_cursor.lnum, TRUE); if (cap->nchar == Ctrl_E || cap->nchar == Ctrl_Y) { int c = ins_copychar(curwin->w_cursor.lnum + (cap->nchar == Ctrl_Y ? -1 : 1)); + + ptr = ml_get_buf(curbuf, curwin->w_cursor.lnum, TRUE); if (c != NUL) ptr[curwin->w_cursor.col] = c; } else + { + ptr = ml_get_buf(curbuf, curwin->w_cursor.lnum, TRUE); ptr[curwin->w_cursor.col] = cap->nchar; + } if (p_sm && msg_silent == 0) showmatch(cap->nchar); ++curwin->w_cursor.col; diff --git a/src/testdir/test_edit.vim b/src/testdir/test_edit.vim index 3fcc11f2d8..518c21ea84 100644 --- a/src/testdir/test_edit.vim +++ b/src/testdir/test_edit.vim @@ -1895,4 +1895,16 @@ func Test_edit_revins() bw! endfunc +" Test for getting the character of the line below after "p" +func Test_edit_put_CTRL_E() + set encoding=latin1 + new + let @" = '' + sil! norm orggRx + sil! norm pr + call assert_equal(['r', 'r'], getline(1, 2)) + bwipe! + set encoding=utf-8 +endfunc + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c index f82881fc06..2d6f6c7bfd 100644 --- a/src/version.c +++ b/src/version.c @@ -756,6 +756,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3428, +/**/ 3427, /**/ 3426, |