patch 8.2.0896: crash when calling searchcount() with a string
Problem: Crash when calling searchcount() with a string.
Solution: Check the argument is a dict. (closes #6192)
diff --git a/src/search.c b/src/search.c
index 2108062..7346383 100644
--- a/src/search.c
+++ b/src/search.c
@@ -3175,7 +3175,7 @@
int save_ws = p_ws;
int wraparound = FALSE;
pos_T p = (*pos);
- static pos_T lastpos = {0, 0, 0};
+ static pos_T lastpos = {0, 0, 0};
static int cur = 0;
static int cnt = 0;
static int exact_match = FALSE;
@@ -4072,11 +4072,17 @@
if (argvars[0].v_type != VAR_UNKNOWN)
{
- dict_T *dict = argvars[0].vval.v_dict;
+ dict_T *dict;
dictitem_T *di;
listitem_T *li;
int error = FALSE;
+ if (argvars[0].v_type != VAR_DICT || argvars[0].vval.v_dict == NULL)
+ {
+ emsg(_(e_dictreq));
+ return;
+ }
+ dict = argvars[0].vval.v_dict;
di = dict_find(dict, (char_u *)"timeout", -1);
if (di != NULL)
{
diff --git a/src/testdir/test_search_stat.vim b/src/testdir/test_search_stat.vim
index 668545c..85e4f86 100644
--- a/src/testdir/test_search_stat.vim
+++ b/src/testdir/test_search_stat.vim
@@ -259,6 +259,10 @@
bwipe!
endfunc
+func Test_searchcount_fails()
+ call assert_fails('echo searchcount("boo!")', 'E715:')
+endfunc
+
func Test_search_stat_foldopen()
CheckScreendump
diff --git a/src/version.c b/src/version.c
index 801069b..0f01712 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 896,
+/**/
895,
/**/
894,