diff options
| author | Michael Ennen <mike.ennen@gmail.com> | 2016-05-19 15:05:37 -0700 |
|---|---|---|
| committer | Michael Ennen <mike.ennen@gmail.com> | 2016-06-09 12:27:28 -0700 |
| commit | 326ae7c8ceddd706106760b8ca672cdbfceda23b (patch) | |
| tree | 1c226b9c8b35b7ad1691c4c099c0efbe7bd68cd5 /src | |
| parent | e35562474803f369bdf7cea306640da3bef6cad3 (diff) | |
| download | rneovim-326ae7c8ceddd706106760b8ca672cdbfceda23b.tar.gz rneovim-326ae7c8ceddd706106760b8ca672cdbfceda23b.tar.bz2 rneovim-326ae7c8ceddd706106760b8ca672cdbfceda23b.zip | |
vim-patch:7.4.1051
Problem: Segfault when unletting "count".
Solution: Check for readonly and locked first. (Dominique Pelle)
Add a test.
https://github.com/vim/vim/commit/af8af8bfac5792fa64efbc524032d568cc7754f7
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval.c | 27 | ||||
| -rw-r--r-- | src/nvim/testdir/Makefile | 1 | ||||
| -rw-r--r-- | src/nvim/testdir/test_unlet.vim | 26 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
4 files changed, 43 insertions, 13 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 3cd53b841d..425c3d3ed5 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -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 == ¤t_funccal->l_vars.dv_hashtab) { - d = ¤t_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 == ¤t_funccal->l_vars.dv_hashtab) { + d = ¤t_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); diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 4b2b150ef2..4c4b46e159 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -39,6 +39,7 @@ NEW_TESTS = \ test_menu.res \ test_syntax.res \ test_timers.res \ + test_unlet.res \ test_viml.res \ test_alot.res diff --git a/src/nvim/testdir/test_unlet.vim b/src/nvim/testdir/test_unlet.vim new file mode 100644 index 0000000000..f6705997a9 --- /dev/null +++ b/src/nvim/testdir/test_unlet.vim @@ -0,0 +1,26 @@ +" Tests for :unlet + +func Test_read_only() + try + " this caused a crash + unlet count + catch + call assert_true(v:exception =~ ':E795:') + endtry +endfunc + +func Test_existing() + let does_exist = 1 + call assert_true(exists('does_exist')) + unlet does_exist + call assert_false(exists('does_exist')) +endfunc + +func Test_not_existing() + unlet! does_not_exist + try + unlet does_not_exist + catch + call assert_true(v:exception =~ ':E108:') + endtry +endfunc diff --git a/src/nvim/version.c b/src/nvim/version.c index d4cc614be7..e4b4f11c09 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -642,7 +642,7 @@ static int included_patches[] = { 1054, 1053, 1052, - // 1051, + 1051, 1050, 1049, 1048, |