diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-01-31 21:13:38 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2023-01-31 21:13:38 +0000 |
| commit | a7d36b732070944aab614944075ec0b409311482 (patch) | |
| tree | 30b3cd689a1df403980f2ce68e3f6316eda6549b | |
| parent | b40c1de38442a26f31efb8473adec7fad560f3d0 (diff) | |
patch 9.0.1270: crash when using search stat in narrow screenv9.0.1270
Problem: Crash when using search stat in narrow screen.
Solution: Check length of message. (closes #11921)
| -rw-r--r-- | src/search.c | 6 | ||||
| -rw-r--r-- | src/testdir/test_search_stat.vim | 23 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 30 insertions, 1 deletions
diff --git a/src/search.c b/src/search.c index 9c8cf95d81..1e4464b0c6 100644 --- a/src/search.c +++ b/src/search.c @@ -3154,7 +3154,11 @@ cmdline_search_stat( len += 2; } - mch_memmove(msgbuf + STRLEN(msgbuf) - len, t, len); + size_t msgbuf_len = STRLEN(msgbuf); + if (len > msgbuf_len) + len = msgbuf_len; + mch_memmove(msgbuf + msgbuf_len - len, t, len); + if (dirc == '?' && stat.cur == maxcount + 1) stat.cur = -1; diff --git a/src/testdir/test_search_stat.vim b/src/testdir/test_search_stat.vim index b8509ba055..e205df574b 100644 --- a/src/testdir/test_search_stat.vim +++ b/src/testdir/test_search_stat.vim @@ -270,6 +270,29 @@ func Test_searchcount_fails() call assert_fails('echo searchcount({"pos" : [1, 2, []]})', 'E745:') endfunc +func Test_search_stat_narrow_screen() + " This used to crash Vim + let save_columns = &columns + try + let after =<< trim [CODE] + set laststatus=2 + set columns=16 + set shortmess-=S showcmd + call setline(1, 'abc') + call feedkeys("/abc\<CR>:quit!\<CR>") + autocmd VimLeavePre * call writefile(["done"], "Xdone") + [CODE] + + if !RunVim([], after, '--clean') + return + endif + call assert_equal("done", readfile("Xdone")[0]) + call delete('Xdone') + finally + let &columns = save_columns + endtry +endfunc + func Test_searchcount_in_statusline() CheckScreendump diff --git a/src/version.c b/src/version.c index ad663cd650..a79a9d0b58 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1270, +/**/ 1269, /**/ 1268, |