diff options
| author | Sean Dewar <seandewar@users.noreply.github.com> | 2021-11-24 03:58:44 +0000 |
|---|---|---|
| committer | Sean Dewar <seandewar@users.noreply.github.com> | 2021-11-24 05:34:20 +0000 |
| commit | dac52e6d044d27cd6d51fdde2fa3be3f9dba11a4 (patch) | |
| tree | df7f5b417c5d8124e35651b1f81c9d925e4320ce | |
| parent | c366c944c2d2f46862f8d3a660e52f2735f816ae (diff) | |
| download | rneovim-dac52e6d044d27cd6d51fdde2fa3be3f9dba11a4.tar.gz rneovim-dac52e6d044d27cd6d51fdde2fa3be3f9dba11a4.tar.bz2 rneovim-dac52e6d044d27cd6d51fdde2fa3be3f9dba11a4.zip | |
vim-patch:8.2.2465: using freed memory in :psearch
Problem: Using freed memory in :psearch. (houyunsong)
Solution: Check the current window is still valid. Fix flaky test.
https://github.com/vim/vim/commit/92bb83e41ca42d0d00d21753810d92485c808a50
Test_cursorhold_insert timer's 100ms delay was already LoadAdjusted, but change
to 200ms (still LoadAdjust) to match Vim anyway.
| -rw-r--r-- | src/nvim/search.c | 3 | ||||
| -rw-r--r-- | src/nvim/testdir/test_autocmd.vim | 28 |
2 files changed, 28 insertions, 3 deletions
diff --git a/src/nvim/search.c b/src/nvim/search.c index 2e45a8f509..f47315705c 100644 --- a/src/nvim/search.c +++ b/src/nvim/search.c @@ -5248,6 +5248,9 @@ search_line: if (depth == -1) { // match in current file if (l_g_do_tagpreview != 0) { + if (!win_valid(curwin_save)) { + break; + } if (!GETFILE_SUCCESS(getfile(curwin_save->w_buffer->b_fnum, NULL, NULL, true, lnum, false))) { break; // failed to jump to file diff --git a/src/nvim/testdir/test_autocmd.vim b/src/nvim/testdir/test_autocmd.vim index 1bc9d95f05..49d56349a5 100644 --- a/src/nvim/testdir/test_autocmd.vim +++ b/src/nvim/testdir/test_autocmd.vim @@ -33,7 +33,7 @@ if has('timers') let g:triggered = 0 au CursorHoldI * let g:triggered += 1 set updatetime=20 - call timer_start(LoadAdjust(100), 'ExitInsertMode') + call timer_start(LoadAdjust(200), 'ExitInsertMode') call feedkeys('a', 'x!') call assert_equal(1, g:triggered) unlet g:triggered @@ -1900,12 +1900,21 @@ endfunc func Test_autocmd_was_using_freed_memory() pedit xx n x - au WinEnter * quit + augroup winenter + au WinEnter * if winnr('$') > 2 | quit | endif + augroup END " Nvim needs large 'winwidth' and 'nowinfixwidth' to crash set winwidth=99999 nowinfixwidth split - au! WinEnter + + augroup winenter + au! WinEnter + augroup END + set winwidth& winfixwidth& + bwipe xx + bwipe x + pclose endfunc func Test_FileChangedShell_reload() @@ -2136,6 +2145,19 @@ func Test_autocmd_closes_window() au! BufWinLeave endfunc +func Test_autocmd_quit_psearch() + sn aa bb + augroup aucmd_win_test + au! + au BufEnter,BufLeave,BufNew,WinEnter,WinLeave,WinNew * if winnr('$') > 1 | q | endif + augroup END + ps / + + augroup aucmd_win_test + au! + augroup END +endfunc + func Test_autocmd_closing_cmdwin() au BufWinLeave * nested q call assert_fails("norm 7q?\n", 'E855:') |