patch 9.0.1270: crash when using search stat in narrow screen
Problem: Crash when using search stat in narrow screen.
Solution: Check length of message. (closes #11921)
diff --git a/src/search.c b/src/search.c
index 9c8cf95..1e4464b 100644
--- a/src/search.c
+++ b/src/search.c
@@ -3154,7 +3154,11 @@
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 b8509ba..e205df5 100644
--- a/src/testdir/test_search_stat.vim
+++ b/src/testdir/test_search_stat.vim
@@ -270,6 +270,29 @@
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 ad663cd..a79a9d0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1270,
+/**/
1269,
/**/
1268,