aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 8.2.0101: crash when passing null object to ":echomsg"

Browse Source 
Problem:    Crash when passing null object to ":echomsg".
Solution:   Check for NULL pointer. (Yasuhiro Matsumoto, closes #5460)
This commit is contained in:
Bram Moolenaar
2020-01-08 18:56:20 +01:00
parent 41a4141ecb
commit 9db2afe46d
3 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/eval.c
View File

@@ -5682,6 +5682,7 @@ tv_stringify(typval_T *varp, char_u *buf)
{ {
if (varp->v_type == VAR_LIST if (varp->v_type == VAR_LIST
|| varp->v_type == VAR_DICT || varp->v_type == VAR_DICT
|| varp->v_type == VAR_BLOB
|| varp->v_type == VAR_FUNC || varp->v_type == VAR_FUNC
|| varp->v_type == VAR_PARTIAL || varp->v_type == VAR_PARTIAL
|| varp->v_type == VAR_FLOAT) || varp->v_type == VAR_FLOAT)
@@ -6057,6 +6058,12 @@ ex_execute(exarg_T *eap)
p = tv_get_string_buf(&rettv, buf); p = tv_get_string_buf(&rettv, buf);
else else
p = tv_stringify(&rettv, buf); p = tv_stringify(&rettv, buf);
if (p == NULL)
{
clear_tv(&rettv);
ret = FAIL;
break;
}
len = (int)STRLEN(p); len = (int)STRLEN(p);
if (ga_grow(&ga, len + 2) == FAIL) if (ga_grow(&ga, len + 2) == FAIL)
{ {

10
src/testdir/test_messages.vim
View File

@@ -268,3 +268,13 @@ func Test_message_more()
call term_sendkeys(buf, ':q!') call term_sendkeys(buf, ':q!')
call StopVimInTerminal(buf) call StopVimInTerminal(buf)
endfunc endfunc
func Test_null()
echom test_null_list()
echom test_null_dict()
echom test_null_blob()
echom test_null_job()
echom test_null_string()
echom test_null_channel()
echom test_null_partial()
endfunc

2
src/version.c
View File

@@ -742,6 +742,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 */
/**/
101,
/**/ /**/
100, 100,
/**/ /**/