aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.2.4642: Vim9: in :def function script var cannot be null

Browse Source 
Problem:    Vim9: in :def function script var cannot be null.
Solution:   Only initialize a script variable when not set to a null value.
            (closes #10034)
This commit is contained in:
Bram Moolenaar
2022-03-28 15:22:35 +01:00
parent 471b3aed3e
commit 859cc21c6b
8 changed files with 119 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/vim9script.c
View File

@@ -822,7 +822,7 @@ vim9_declare_scriptvar(exarg_T *eap, char_u *arg)
init_tv.v_type = VAR_NUMBER;
else
init_tv.v_type = type->tt_type;
set_var_const(name, 0, type, &init_tv, FALSE, 0, 0);
set_var_const(name, 0, type, &init_tv, FALSE, ASSIGN_INIT, 0);
vim_free(name);
return p;
@@ -925,6 +925,13 @@ update_vim9_script_var(
if (*type == NULL)
*type = typval2type(tv, get_copyID(), &si->sn_type_list,
do_member ? TVTT_DO_MEMBER : 0);
else if ((flags & ASSIGN_INIT) == 0
&& (*type)->tt_type == VAR_BLOB && tv->v_type == VAR_BLOB
&& tv->vval.v_blob == NULL)
{
// "var b: blob = null_blob" has a different type.
*type = &t_blob_null;
}
if (sv->sv_type_allocated)
free_type(sv->sv_type);
if (*type != NULL && ((*type)->tt_type == VAR_FUNC