aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-08-29 20:33:37 -04:00
Code

patch 8.2.0896: crash when calling searchcount() with a string

Browse Source 
Problem:    Crash when calling searchcount() with a string.
Solution:   Check the argument is a dict. (closes #6192)
This commit is contained in:
Bram Moolenaar 2020-06-03 22:57:39 +02:00
parent 408c23b079
commit 14681627f3
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/search.c
View File

@ -3175,7 +3175,7 @@ update_search_stat(
int save_ws = p_ws; int save_ws = p_ws;
int wraparound = FALSE; int wraparound = FALSE;
pos_T p = (*pos); pos_T p = (*pos);
static pos_T lastpos = {0, 0, 0}; static pos_T lastpos = {0, 0, 0};
static int cur = 0; static int cur = 0;
static int cnt = 0; static int cnt = 0;
static int exact_match = FALSE; static int exact_match = FALSE;
@ -4072,11 +4072,17 @@ f_searchcount(typval_T *argvars, typval_T *rettv)
if (argvars[0].v_type != VAR_UNKNOWN) if (argvars[0].v_type != VAR_UNKNOWN)
{ {
dict_T *dict = argvars[0].vval.v_dict; dict_T *dict;
dictitem_T *di; dictitem_T *di;
listitem_T *li; listitem_T *li;
int error = FALSE; 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); di = dict_find(dict, (char_u *)"timeout", -1);
if (di != NULL) if (di != NULL)
{ {

4
src/testdir/test_search_stat.vim
View File

@ -259,6 +259,10 @@ func Test_search_stat()
bwipe! bwipe!
endfunc endfunc
func Test_searchcount_fails()
call assert_fails('echo searchcount("boo!")', 'E715:')
endfunc
func Test_search_stat_foldopen() func Test_search_stat_foldopen()
CheckScreendump CheckScreendump

2
src/version.c
View File

@ -746,6 +746,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
896,
/**/ /**/
895, 895,
/**/ /**/