diff options
author | zeertzjq <zeertzjq@outlook.com> | 2022-05-19 09:56:44 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-19 09:56:44 +0800 |
commit | 341d0ec3b31018ebb38d6ecf9b6f4a2319bbfc18 (patch) | |
tree | 1fcb77ae93500ddaa7772c069c5bfd0f3a0f3ff9 | |
parent | 6a2883c17159ce5026c1bae8f6ad53a7859f83e3 (diff) | |
download | rneovim-341d0ec3b31018ebb38d6ecf9b6f4a2319bbfc18.tar.gz rneovim-341d0ec3b31018ebb38d6ecf9b6f4a2319bbfc18.tar.bz2 rneovim-341d0ec3b31018ebb38d6ecf9b6f4a2319bbfc18.zip |
vim-patch:8.2.4979: accessing freed memory when line is flushed (#18634)
Problem: Accessing freed memory when line is flushed.
Solution: Make a copy of the pattern to search for.
https://github.com/vim/vim/commit/28d032cc688ccfda18c5bbcab8b50aba6e18cde5
-rw-r--r-- | src/nvim/testdir/test_tagjump.vim | 9 | ||||
-rw-r--r-- | src/nvim/window.c | 7 |
2 files changed, 15 insertions, 1 deletions
diff --git a/src/nvim/testdir/test_tagjump.vim b/src/nvim/testdir/test_tagjump.vim index e0b05edf15..2fe3c448d6 100644 --- a/src/nvim/testdir/test_tagjump.vim +++ b/src/nvim/testdir/test_tagjump.vim @@ -1077,6 +1077,15 @@ Type number and <Enter> (q or empty cancels): %bwipe endfunc +func Test_define_search() + " this was accessing freed memory + new + call setline(1, ['first line', '', '#define something 0']) + sil norm o0 + sil! norm + bwipe! +endfunc + " Test for the 'taglength' option func Test_tag_length() set tags=Xtags diff --git a/src/nvim/window.c b/src/nvim/window.c index 5cc24bbb5b..9c9b1fe176 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -515,9 +515,14 @@ wingotofile: if ((len = find_ident_under_cursor(&ptr, FIND_IDENT)) == 0) { break; } + + // Make a copy, if the line was changed it will be freed. + ptr = vim_strnsave(ptr, len); + find_pattern_in_path(ptr, 0, len, true, Prenum == 0, type, Prenum1, ACTION_SPLIT, 1, MAXLNUM); - curwin->w_set_curswant = TRUE; + xfree(ptr); + curwin->w_set_curswant = true; break; // Quickfix window only: view the result under the cursor in a new split. |