Mercurial > vim
changeset 25786:ec62e0764ffa v8.2.3428
patch 8.2.3428: using freed memory when replacing
Commit: https://github.com/vim/vim/commit/35a9a00afcb20897d462a766793ff45534810dc3
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Sep 11 21:14:20 2021 +0200
patch 8.2.3428: using freed memory when replacing
Problem: Using freed memory when replacing. (Dhiraj Mishra)
Solution: Get the line pointer after calling ins_copychar().
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 11 Sep 2021 21:15:03 +0200 |
| parents | 468662f24b0a |
| children | 829a412396db |
| files | src/normal.c src/testdir/test_edit.vim src/version.c |
| diffstat | 3 files changed, 21 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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;
--- 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