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.2.1154: Vim9: crash when using imported function

Browse Source 
Problem:    Vim9: crash when using imported function.
Solution:   Check for a function type.  Set the script context when calling a
            function. (closes #6412)
This commit is contained in:
Bram Moolenaar
2020-07-08 15:16:19 +02:00
parent bed36b939a
commit c620c055ce
7 changed files with 84 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/evalvars.c
View File

@@ -2375,6 +2375,7 @@ eval_variable(
{
int ret = OK;
typval_T *tv = NULL;
int foundFunc = FALSE;
dictitem_T *v;
int cc;
@@ -2402,21 +2403,36 @@ eval_variable(
// imported variable from another script
if (import != NULL)
{
scriptitem_T *si = SCRIPT_ITEM(import->imp_sid);
svar_T *sv = ((svar_T *)si->sn_var_vals.ga_data)
if (import->imp_funcname != NULL)
{
foundFunc = TRUE;
if (rettv != NULL)
{
rettv->v_type = VAR_FUNC;
rettv->vval.v_string = vim_strsave(import->imp_funcname);
}
}
else
{
scriptitem_T *si = SCRIPT_ITEM(import->imp_sid);
svar_T *sv = ((svar_T *)si->sn_var_vals.ga_data)
+ import->imp_var_vals_idx;
tv = sv->sv_tv;
tv = sv->sv_tv;
}
}
}
if (tv == NULL)
if (!foundFunc)
{
if (rettv != NULL && verbose)
semsg(_(e_undefvar), name);
ret = FAIL;
if (tv == NULL)
{
if (rettv != NULL && verbose)
semsg(_(e_undefvar), name);
ret = FAIL;
}
else if (rettv != NULL)
copy_tv(tv, rettv);
}
else if (rettv != NULL)
copy_tv(tv, rettv);
name[len] = cc;