diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-04-01 17:08:04 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2022-04-01 17:11:56 +0800 |
| commit | 649a11bc139d109e8a3adc893a9e53ab32cf248c (patch) | |
| tree | 1294533c4adec5f2cb44a4d3789a574a34fc1d3e | |
| parent | 88a4ac22f082e5c9d59acd8e9031908e1d2853c3 (diff) | |
| download | rneovim-649a11bc139d109e8a3adc893a9e53ab32cf248c.tar.gz rneovim-649a11bc139d109e8a3adc893a9e53ab32cf248c.tar.bz2 rneovim-649a11bc139d109e8a3adc893a9e53ab32cf248c.zip | |
vim-patch:8.2.3471: crash when using CTRL-T after an empty search pattern
Problem: Crash when using CTRL-T after an empty search pattern.
Solution: Bail out when there is no previous search pattern. (closes vim/vim#8953)
https://github.com/vim/vim/commit/d8d957de86f218de9124ca1209548f8c6f61b69b
| -rw-r--r-- | src/nvim/ex_getln.c | 4 | ||||
| -rw-r--r-- | src/nvim/testdir/test_search.vim | 10 |
2 files changed, 14 insertions, 0 deletions
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index 1d02c74c41..9104a2dd5a 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -1606,6 +1606,10 @@ static int may_do_command_line_next_incsearch(int firstc, long count, incsearch_ if (search_delim == ccline.cmdbuff[skiplen]) { pat = last_search_pattern(); + if (pat == NULL) { + restore_last_search_pattern(); + return FAIL; + } skiplen = 0; patlen = (int)STRLEN(pat); } else { diff --git a/src/nvim/testdir/test_search.vim b/src/nvim/testdir/test_search.vim index a3d5ca96a1..f88017388a 100644 --- a/src/nvim/testdir/test_search.vim +++ b/src/nvim/testdir/test_search.vim @@ -1527,4 +1527,14 @@ func Test_incsearch_highlighting_newline() bw endfunc +func Test_no_last_search_pattern() + CheckOption incsearch + + let @/ = "" + set incsearch + " this was causing a crash + call feedkeys("//\x14", 'xt') +endfunc + + " vim: shiftwidth=2 sts=2 expandtab |