# HG changeset patch # User Bram Moolenaar # Date 1633374006 -7200 # Node ID 054623fc54c5e73aebe506cccb6ca7a3707618fc # Parent 804e25dfd95038da412c7a71bbf479a1fa4f0495 patch 8.2.3471: crash when using CTRL-T after an empty search pattern Commit: https://github.com/vim/vim/commit/d8d957de86f218de9124ca1209548f8c6f61b69b Author: Bram Moolenaar Date: Mon Oct 4 19:47:35 2021 +0100 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 https://github.com/vim/vim/issues/8953) diff --git a/src/ex_getln.c b/src/ex_getln.c --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -612,7 +612,8 @@ may_adjust_incsearch_highlighting( // NOTE: must call restore_last_search_pattern() before returning! save_last_search_pattern(); - if (!do_incsearch_highlighting(firstc, &search_delim, is_state, &skiplen, &patlen)) + if (!do_incsearch_highlighting(firstc, &search_delim, is_state, + &skiplen, &patlen)) { restore_last_search_pattern(); return OK; @@ -626,6 +627,11 @@ may_adjust_incsearch_highlighting( 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); } diff --git a/src/testdir/test_search.vim b/src/testdir/test_search.vim --- a/src/testdir/test_search.vim +++ b/src/testdir/test_search.vim @@ -1977,4 +1977,14 @@ func Test_pattern_is_uppercase_smartcase 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 diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -758,6 +758,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3471, +/**/ 3470, /**/ 3469,