diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-01-04 22:05:24 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-01-04 22:05:24 +0100 |
| commit | af8af8bfac5792fa64efbc524032d568cc7754f7 (patch) | |
| tree | 2d6bd98660f17197e6d630ccd2dc0be704e0dcd4 | |
| parent | c71982b23978ef61d0a2f0fe5535e782e1c561ed (diff) | |
patch 7.4.1051v7.4.1051
Problem: Segfault when unletting "count".
Solution: Check for readonly and locked first. (Dominique Pelle)
Add a test.
| -rw-r--r-- | src/eval.c | 27 | ||||
| -rw-r--r-- | src/testdir/test_alot.vim | 1 | ||||
| -rw-r--r-- | src/testdir/test_unlet.vim | 26 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 44 insertions, 12 deletions
diff --git a/src/eval.c b/src/eval.c index feaa71c33c..76dd65387a 100644 --- a/src/eval.c +++ b/src/eval.c @@ -3737,24 +3737,27 @@ do_unlet(name, forceit) ht = find_var_ht(name, &varname); 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; + delete_var(ht, hi); return OK; } diff --git a/src/testdir/test_alot.vim b/src/testdir/test_alot.vim index 9800afce7b..413e71b543 100644 --- a/src/testdir/test_alot.vim +++ b/src/testdir/test_alot.vim @@ -8,3 +8,4 @@ source test_searchpos.vim source test_set.vim source test_sort.vim source test_undolevels.vim +source test_unlet.vim diff --git a/src/testdir/test_unlet.vim b/src/testdir/test_unlet.vim new file mode 100644 index 0000000000..f6705997a9 --- /dev/null +++ b/src/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/version.c b/src/version.c index 470cce8a98..402fd0ab04 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1051, +/**/ 1050, /**/ 1049, |