thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.2920: still a way to shadow a builtin function

Browse Source 
Problem:    Still a way to shadow a builtin function. (Yasuhiro Matsumoto)
Solution:   Check the key when using extend(). (issue #8302)
This commit is contained in:
Bram Moolenaar
2021-06-01 21:21:55 +02:00
parent 6a43b37b76
commit 6f1d2aa437
5 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/dict.c
View File

@@ -344,6 +344,20 @@ dict_copy(dict_T *orig, int deep, int copyID)
return copy;
}
/*
* Check for adding a function to g: or s:.
* If the name is wrong give an error message and return TRUE.
*/
int
dict_wrong_func_name(dict_T *d, typval_T *tv, char_u *name)
{
return (d == get_globvar_dict()
|| (SCRIPT_ID_VALID(current_sctx.sc_sid)
&& d == &SCRIPT_ITEM(current_sctx.sc_sid)->sn_vars->sv_dict))
&& (tv->v_type == VAR_FUNC || tv->v_type == VAR_PARTIAL)
&& var_wrong_func_name(name, TRUE);
}
/*
* Add item "item" to Dictionary "d".
* Returns FAIL when out of memory and when key already exists.
@@ -351,6 +365,8 @@ dict_copy(dict_T *orig, int deep, int copyID)
int
dict_add(dict_T *d, dictitem_T *item)
{
if (dict_wrong_func_name(d, &item->di_tv, item->di_key))
return FAIL;
return hash_add(&d->dv_hashtab, item->di_key);
}
@@ -1109,6 +1125,8 @@ dict_extend(dict_T *d1, dict_T *d2, char_u *action)
if (value_check_lock(di1->di_tv.v_lock, arg_errmsg, TRUE)
|| var_check_ro(di1->di_flags, arg_errmsg, TRUE))
break;
if (dict_wrong_func_name(d1, &HI2DI(hi2)->di_tv, hi2->hi_key))
break;
clear_tv(&di1->di_tv);
copy_tv(&HI2DI(hi2)->di_tv, &di1->di_tv);
}