aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.1.0804: crash when setting v:errmsg to empty list

Browse Source 
Problem:    Crash when setting v:errmsg to empty list. (Jaon Franklin)
Solution:   Separate getting value and assigning result.
This commit is contained in:
Bram Moolenaar
2019-01-24 13:58:11 +01:00
parent ad36a3588d
commit 4b9e91f0ba
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/eval.c
View File

@@ -7892,9 +7892,16 @@ set_var(
{
if (v->di_tv.v_type == VAR_STRING)
{
vim_free(v->di_tv.vval.v_string);
VIM_CLEAR(v->di_tv.vval.v_string);
if (copy || tv->v_type != VAR_STRING)
v->di_tv.vval.v_string = vim_strsave(tv_get_string(tv));
{
char_u *val = tv_get_string(tv);
// Careful: when assigning to v:errmsg and tv_get_string()
// causes an error message the variable will alrady be set.
if (v->di_tv.vval.v_string == NULL)
v->di_tv.vval.v_string = vim_strsave(val);
}
else
{
/* Take over the string to avoid an extra alloc/free. */

7
src/testdir/test_eval_stuff.vim
View File

@@ -87,3 +87,10 @@ func Test_readfile_binary()
bwipe!
call delete('XReadfile')
endfunc
func Test_let_errmsg()
call assert_fails('let v:errmsg = []', 'E730:')
let v:errmsg = ''
call assert_fails('let v:errmsg = []', 'E730:')
let v:errmsg = ''
endfunc

2
src/version.c
View File

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