mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-14 15:28:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.1051

Browse Source 
Problem:    Segfault when unletting "count".
Solution:   Check for readonly and locked first. (Dominique Pelle)
            Add a test.

af8af8bfac
This commit is contained in:
Michael Ennen
2016-05-19 15:05:37 -07:00
parent e355624748
commit 326ae7c8ce
4 changed files with 43 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/nvim/eval.c
View File

@@ -2973,24 +2973,27 @@ int do_unlet(char_u *name, int forceit)
ht = find_var_ht_dict(name, &varname, &dict);
if (ht != NULL && *varname != NUL) {
if (ht == &globvarht) {
d = &globvardict;
} else if (current_funccal != NULL
&& ht == &current_funccal->l_vars.dv_hashtab) {
d = &current_funccal->l_vars;
} else {
di = find_var_in_ht(ht, *name, (char_u *)"", false);
d = di->di_tv.vval.v_dict;
}
hi = hash_find(ht, varname);
if (!HASHITEM_EMPTY(hi)) {
di = HI2DI(hi);
if (var_check_fixed(di->di_flags, name, false)
|| var_check_ro(di->di_flags, name, false)
|| tv_check_lock(d->dv_lock, name, false)) {
|| var_check_ro(di->di_flags, name, false)) {
return FAIL;
}
if (ht == &globvarht) {
d = &globvardict;
} else if (current_funccal != NULL
&& ht == &current_funccal->l_vars.dv_hashtab) {
d = &current_funccal->l_vars;
} else {
di = find_var_in_ht(ht, *name, (char_u *)"", false);
d = di->di_tv.vval.v_dict;
}
if (d == NULL || tv_check_lock(d->dv_lock, name, false)) {
return FAIL;
}
typval_T oldtv;
bool watched = is_watched(dict);